From nobody Tue Feb 10 20:50:13 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1679759676; cv=none; d=zohomail.com; s=zohoarc; b=Ve9Rnrn26ExfQJCSb04y/BKoAkPrBjacN1Tb5V2d7+a71JINSIcPnEe9GTxYD97durC99NJo4Aux+iRWekPABmpWXpe0/oiekxLwxt0EPrp7lEpzxpDWUmLQgHzwBon1Q+4QugJu1ZWde460mHcyncO++iIV1L6KBwyf9UYGEbE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679759676; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=nIk4Ftu5LpbIyNP7uODmVFJADX/1dskgtVg2XJ97txU=; b=CMOQ4jumu7c2IhSjeQXR9hXk0aI1Jaa+VmQSpreWJSH7nloGGVCNcKguyeAdQBqcVVlEPwNBbqZZkFFbPaY8YC0+T06FfxzpgbiWTWfCICCHUeDiAqisgRY6ILx4AA4IZsZBqL8JivbGUp0+i9fhmP1X5UMD1awNVOMzlN+E0tQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1679759676854469.734637713654; Sat, 25 Mar 2023 08:54:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pg6Cn-0005Uv-7V; Sat, 25 Mar 2023 11:53:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pg2ii-00037N-3z; Sat, 25 Mar 2023 08:10:04 -0400 Received: from mail-qt1-x82e.google.com ([2607:f8b0:4864:20::82e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pg2if-00009h-L2; Sat, 25 Mar 2023 08:10:03 -0400 Received: by mail-qt1-x82e.google.com with SMTP id s12so362268qtx.11; Sat, 25 Mar 2023 05:10:00 -0700 (PDT) Received: from localhost.localdomain ([2409:8900:c84:a112:bd7b:48e3:7174:ae1e]) by smtp.gmail.com with ESMTPSA id je9-20020a170903264900b001a065d3ea3bsm15391991plb.295.2023.03.25.01.52.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Mar 2023 01:52:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679746200; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=nIk4Ftu5LpbIyNP7uODmVFJADX/1dskgtVg2XJ97txU=; b=mIY3wMT9bI2lUErkO0gSvEdjGOJtVatlEPMXF8B0XYMb9mLqJrar/pzSfdrdf2QN6g d7W8XlqDJ/OunLJHxuVNvfJDWbQs0cydDcS79LOfleUZad/gODUU3Az+qBnOuujvsIRN 6yKClxBJVkJ6a34eLcAV5nHxi8aYoFM2zcABmAPQLxm2Y6/AakBblJLJhpWBuyC0Jjse tGcrD9hJY1YZcPg2kZl2fHGyf0Pbnk+RLzsQgsW7BuijP616/1o9vch2mjxB/wU1/VXb Yb64WicQsERynbaDCyCUkF6uh7z7yA2OAoY63toJMU2ZakD9BsGSs2hxQL7qW7GRPFpa QxTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679746200; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=nIk4Ftu5LpbIyNP7uODmVFJADX/1dskgtVg2XJ97txU=; b=O0B66uRfSvghxBAIJeKTyLsvxXmu3KOf3ioNvKOMgJZUxQgKFF20ZvUkCjV+NRg50s nPXewj8HBHK+ln9qsRR6Q5t1JwOvrnGrQmR6MenB54NGJvqgF2KwvqXsaZNzVorAglkY 4iJmpRxx6kG7T7OLFg0oU7OQ632qzQTCQOPNWnU3jbNkpYas3BB1VBr+rj+TwpXwo5Y1 Xmx2PM07EyDrpCQitMyMuy7oq1KV02gQz1BB5+rw3Z5GdH7j+xcserRl1oNMEvfuoNgT Ns5EYnX6C69s1v30xmGJsVAqGGNrInt0RY7bsK6ffNiY1bCcyYkPdU5hSQLPXRCzGbTC Kwfw== X-Gm-Message-State: AAQBX9dR/vuz/CcIa3MKj7Cx18ZONhRl6qHnTBqMphLTXv0NTeO6Lw5E o8uVrPHMKd3x5sABtVS3YiIUKNyzzllYw7miHkM= X-Google-Smtp-Source: AKy350YrNFm96uuGF3CJ/UugnJbYpvENsxheIjamQ1I9Z4BPOv2PmvTiGTlv/qhxKLbe1g1ZRKAKXQ== X-Received: by 2002:a17:902:e5cf:b0:19a:c65d:f90 with SMTP id u15-20020a170902e5cf00b0019ac65d0f90mr6005881plf.44.1679734353281; Sat, 25 Mar 2023 01:52:33 -0700 (PDT) From: Yeqi Fu To: Thomas Huth Cc: Kevin Wolf , qemu-block@nongnu.org, qemu-devel@nongnu.org, Yeqi Fu Subject: [PATCH v3] block: replace TABs with space Date: Sat, 25 Mar 2023 16:52:24 +0800 Message-Id: <20230325085224.23842-1-fufuyqqqqqq@gmail.com> X-Mailer: git-send-email 2.32.0 (Apple Git-132) MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::82e; envelope-from=fufuyqqqqqq@gmail.com; helo=mail-qt1-x82e.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HK_RANDOM_ENVFROM=0.999, HK_RANDOM_FROM=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sat, 25 Mar 2023 11:53:18 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1679759677998100001 Content-Type: text/plain; charset="utf-8" Bring the block files in line with the QEMU coding style, with spaces for indentation. This patch partially resolves the issue 371. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/371 Signed-off-by: Yeqi Fu --- block/bochs.c | 18 +++---- block/file-posix.c | 126 ++++++++++++++++++++++---------------------- block/file-win32.c | 66 +++++++++++------------ block/parallels.c | 34 ++++++------ block/qcow.c | 44 ++++++++-------- include/block/nbd.h | 2 +- 6 files changed, 145 insertions(+), 145 deletions(-) diff --git a/block/bochs.c b/block/bochs.c index 2f5ae52c90..18f48d2f89 100644 --- a/block/bochs.c +++ b/block/bochs.c @@ -293,15 +293,15 @@ static void bochs_close(BlockDriverState *bs) } =20 static BlockDriver bdrv_bochs =3D { - .format_name =3D "bochs", - .instance_size =3D sizeof(BDRVBochsState), - .bdrv_probe =3D bochs_probe, - .bdrv_open =3D bochs_open, - .bdrv_child_perm =3D bdrv_default_perms, - .bdrv_refresh_limits =3D bochs_refresh_limits, - .bdrv_co_preadv =3D bochs_co_preadv, - .bdrv_close =3D bochs_close, - .is_format =3D true, + .format_name =3D "bochs", + .instance_size =3D sizeof(BDRVBochsState), + .bdrv_probe =3D bochs_probe, + .bdrv_open =3D bochs_open, + .bdrv_child_perm =3D bdrv_default_perms, + .bdrv_refresh_limits =3D bochs_refresh_limits, + .bdrv_co_preadv =3D bochs_co_preadv, + .bdrv_close =3D bochs_close, + .is_format =3D true, }; =20 static void bdrv_bochs_init(void) diff --git a/block/file-posix.c b/block/file-posix.c index 5760cf22d1..bdebe0c9a6 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -124,7 +124,7 @@ #define FTYPE_FILE 0 #define FTYPE_CD 1 =20 -#define MAX_BLOCKSIZE 4096 +#define MAX_BLOCKSIZE 4096 =20 /* Posix file locking bytes. Libvirt takes byte 0, we start from higher by= tes, * leaving a few more bytes for its future use. */ @@ -3819,42 +3819,42 @@ static void coroutine_fn cdrom_co_lock_medium(Block= DriverState *bs, bool locked) } =20 static BlockDriver bdrv_host_cdrom =3D { - .format_name =3D "host_cdrom", - .protocol_name =3D "host_cdrom", - .instance_size =3D sizeof(BDRVRawState), - .bdrv_needs_filename =3D true, - .bdrv_probe_device =3D cdrom_probe_device, - .bdrv_parse_filename =3D cdrom_parse_filename, - .bdrv_file_open =3D cdrom_open, - .bdrv_close =3D raw_close, - .bdrv_reopen_prepare =3D raw_reopen_prepare, - .bdrv_reopen_commit =3D raw_reopen_commit, - .bdrv_reopen_abort =3D raw_reopen_abort, - .bdrv_co_create_opts =3D bdrv_co_create_opts_simple, - .create_opts =3D &bdrv_create_opts_simple, - .mutable_opts =3D mutable_opts, - .bdrv_co_invalidate_cache =3D raw_co_invalidate_cache, - - .bdrv_co_preadv =3D raw_co_preadv, - .bdrv_co_pwritev =3D raw_co_pwritev, - .bdrv_co_flush_to_disk =3D raw_co_flush_to_disk, - .bdrv_refresh_limits =3D raw_refresh_limits, - .bdrv_co_io_plug =3D raw_co_io_plug, - .bdrv_co_io_unplug =3D raw_co_io_unplug, - .bdrv_attach_aio_context =3D raw_aio_attach_aio_context, - - .bdrv_co_truncate =3D raw_co_truncate, - .bdrv_co_getlength =3D raw_co_getlength, - .has_variable_length =3D true, - .bdrv_co_get_allocated_file_size =3D raw_co_get_allocated_file_size, + .format_name =3D "host_cdrom", + .protocol_name =3D "host_cdrom", + .instance_size =3D sizeof(BDRVRawState), + .bdrv_needs_filename =3D true, + .bdrv_probe_device =3D cdrom_probe_device, + .bdrv_parse_filename =3D cdrom_parse_filename, + .bdrv_file_open =3D cdrom_open, + .bdrv_close =3D raw_close, + .bdrv_reopen_prepare =3D raw_reopen_prepare, + .bdrv_reopen_commit =3D raw_reopen_commit, + .bdrv_reopen_abort =3D raw_reopen_abort, + .bdrv_co_create_opts =3D bdrv_co_create_opts_simple, + .create_opts =3D &bdrv_create_opts_simple, + .mutable_opts =3D mutable_opts, + .bdrv_co_invalidate_cache =3D raw_co_invalidate_cache, + + .bdrv_co_preadv =3D raw_co_preadv, + .bdrv_co_pwritev =3D raw_co_pwritev, + .bdrv_co_flush_to_disk =3D raw_co_flush_to_disk, + .bdrv_refresh_limits =3D raw_refresh_limits, + .bdrv_co_io_plug =3D raw_co_io_plug, + .bdrv_co_io_unplug =3D raw_co_io_unplug, + .bdrv_attach_aio_context =3D raw_aio_attach_aio_context, + + .bdrv_co_truncate =3D raw_co_truncate, + .bdrv_co_getlength =3D raw_co_getlength, + .has_variable_length =3D true, + .bdrv_co_get_allocated_file_size =3D raw_co_get_allocated_file_size, =20 /* removable device support */ - .bdrv_co_is_inserted =3D cdrom_co_is_inserted, - .bdrv_co_eject =3D cdrom_co_eject, - .bdrv_co_lock_medium =3D cdrom_co_lock_medium, + .bdrv_co_is_inserted =3D cdrom_co_is_inserted, + .bdrv_co_eject =3D cdrom_co_eject, + .bdrv_co_lock_medium =3D cdrom_co_lock_medium, =20 /* generic scsi device */ - .bdrv_co_ioctl =3D hdev_co_ioctl, + .bdrv_co_ioctl =3D hdev_co_ioctl, }; #endif /* __linux__ */ =20 @@ -3949,38 +3949,38 @@ static void coroutine_fn cdrom_co_lock_medium(Block= DriverState *bs, bool locked) } =20 static BlockDriver bdrv_host_cdrom =3D { - .format_name =3D "host_cdrom", - .protocol_name =3D "host_cdrom", - .instance_size =3D sizeof(BDRVRawState), - .bdrv_needs_filename =3D true, - .bdrv_probe_device =3D cdrom_probe_device, - .bdrv_parse_filename =3D cdrom_parse_filename, - .bdrv_file_open =3D cdrom_open, - .bdrv_close =3D raw_close, - .bdrv_reopen_prepare =3D raw_reopen_prepare, - .bdrv_reopen_commit =3D raw_reopen_commit, - .bdrv_reopen_abort =3D raw_reopen_abort, - .bdrv_co_create_opts =3D bdrv_co_create_opts_simple, - .create_opts =3D &bdrv_create_opts_simple, - .mutable_opts =3D mutable_opts, - - .bdrv_co_preadv =3D raw_co_preadv, - .bdrv_co_pwritev =3D raw_co_pwritev, - .bdrv_co_flush_to_disk =3D raw_co_flush_to_disk, - .bdrv_refresh_limits =3D raw_refresh_limits, - .bdrv_co_io_plug =3D raw_co_io_plug, - .bdrv_co_io_unplug =3D raw_co_io_unplug, - .bdrv_attach_aio_context =3D raw_aio_attach_aio_context, - - .bdrv_co_truncate =3D raw_co_truncate, - .bdrv_co_getlength =3D raw_co_getlength, - .has_variable_length =3D true, - .bdrv_co_get_allocated_file_size =3D raw_co_get_allocated_file_size, + .format_name =3D "host_cdrom", + .protocol_name =3D "host_cdrom", + .instance_size =3D sizeof(BDRVRawState), + .bdrv_needs_filename =3D true, + .bdrv_probe_device =3D cdrom_probe_device, + .bdrv_parse_filename =3D cdrom_parse_filename, + .bdrv_file_open =3D cdrom_open, + .bdrv_close =3D raw_close, + .bdrv_reopen_prepare =3D raw_reopen_prepare, + .bdrv_reopen_commit =3D raw_reopen_commit, + .bdrv_reopen_abort =3D raw_reopen_abort, + .bdrv_co_create_opts =3D bdrv_co_create_opts_simple, + .create_opts =3D &bdrv_create_opts_simple, + .mutable_opts =3D mutable_opts, + + .bdrv_co_preadv =3D raw_co_preadv, + .bdrv_co_pwritev =3D raw_co_pwritev, + .bdrv_co_flush_to_disk =3D raw_co_flush_to_disk, + .bdrv_refresh_limits =3D raw_refresh_limits, + .bdrv_co_io_plug =3D raw_co_io_plug, + .bdrv_co_io_unplug =3D raw_co_io_unplug, + .bdrv_attach_aio_context =3D raw_aio_attach_aio_context, + + .bdrv_co_truncate =3D raw_co_truncate, + .bdrv_co_getlength =3D raw_co_getlength, + .has_variable_length =3D true, + .bdrv_co_get_allocated_file_size =3D raw_co_get_allocated_file_size, =20 /* removable device support */ - .bdrv_co_is_inserted =3D cdrom_co_is_inserted, - .bdrv_co_eject =3D cdrom_co_eject, - .bdrv_co_lock_medium =3D cdrom_co_lock_medium, + .bdrv_co_is_inserted =3D cdrom_co_is_inserted, + .bdrv_co_eject =3D cdrom_co_eject, + .bdrv_co_lock_medium =3D cdrom_co_lock_medium, }; #endif /* __FreeBSD__ */ =20 diff --git a/block/file-win32.c b/block/file-win32.c index c7d0b85306..cb32ac77c0 100644 --- a/block/file-win32.c +++ b/block/file-win32.c @@ -743,31 +743,31 @@ static QemuOptsList raw_create_opts =3D { }; =20 BlockDriver bdrv_file =3D { - .format_name =3D "file", - .protocol_name =3D "file", - .instance_size =3D sizeof(BDRVRawState), + .format_name =3D "file", + .protocol_name =3D "file", + .instance_size =3D sizeof(BDRVRawState), .bdrv_needs_filename =3D true, .bdrv_parse_filename =3D raw_parse_filename, - .bdrv_file_open =3D raw_open, + .bdrv_file_open =3D raw_open, .bdrv_refresh_limits =3D raw_probe_alignment, - .bdrv_close =3D raw_close, + .bdrv_close =3D raw_close, .bdrv_co_create_opts =3D raw_co_create_opts, - .bdrv_has_zero_init =3D bdrv_has_zero_init_1, + .bdrv_has_zero_init =3D bdrv_has_zero_init_1, =20 .bdrv_reopen_prepare =3D raw_reopen_prepare, .bdrv_reopen_commit =3D raw_reopen_commit, .bdrv_reopen_abort =3D raw_reopen_abort, =20 - .bdrv_aio_preadv =3D raw_aio_preadv, - .bdrv_aio_pwritev =3D raw_aio_pwritev, - .bdrv_aio_flush =3D raw_aio_flush, + .bdrv_aio_preadv =3D raw_aio_preadv, + .bdrv_aio_pwritev =3D raw_aio_pwritev, + .bdrv_aio_flush =3D raw_aio_flush, =20 - .bdrv_co_truncate =3D raw_co_truncate, - .bdrv_co_getlength =3D raw_co_getlength, + .bdrv_co_truncate =3D raw_co_truncate, + .bdrv_co_getlength =3D raw_co_getlength, .bdrv_co_get_allocated_file_size - =3D raw_co_get_allocated_file_size, + =3D raw_co_get_allocated_file_size, =20 - .create_opts =3D &raw_create_opts, + .create_opts =3D &raw_create_opts, }; =20 /***********************************************/ @@ -915,26 +915,26 @@ done: } =20 static BlockDriver bdrv_host_device =3D { - .format_name =3D "host_device", - .protocol_name =3D "host_device", - .instance_size =3D sizeof(BDRVRawState), - .bdrv_needs_filename =3D true, - .bdrv_parse_filename =3D hdev_parse_filename, - .bdrv_probe_device =3D hdev_probe_device, - .bdrv_file_open =3D hdev_open, - .bdrv_close =3D raw_close, - .bdrv_refresh_limits =3D hdev_refresh_limits, - - .bdrv_aio_preadv =3D raw_aio_preadv, - .bdrv_aio_pwritev =3D raw_aio_pwritev, - .bdrv_aio_flush =3D raw_aio_flush, - - .bdrv_detach_aio_context =3D raw_detach_aio_context, - .bdrv_attach_aio_context =3D raw_attach_aio_context, - - .bdrv_co_getlength =3D raw_co_getlength, - .has_variable_length =3D true, - .bdrv_co_get_allocated_file_size =3D raw_co_get_allocated_file_size, + .format_name =3D "host_device", + .protocol_name =3D "host_device", + .instance_size =3D sizeof(BDRVRawState), + .bdrv_needs_filename =3D true, + .bdrv_parse_filename =3D hdev_parse_filename, + .bdrv_probe_device =3D hdev_probe_device, + .bdrv_file_open =3D hdev_open, + .bdrv_close =3D raw_close, + .bdrv_refresh_limits =3D hdev_refresh_limits, + + .bdrv_aio_preadv =3D raw_aio_preadv, + .bdrv_aio_pwritev =3D raw_aio_pwritev, + .bdrv_aio_flush =3D raw_aio_flush, + + .bdrv_detach_aio_context =3D raw_detach_aio_context, + .bdrv_attach_aio_context =3D raw_attach_aio_context, + + .bdrv_co_getlength =3D raw_co_getlength, + .has_variable_length =3D true, + .bdrv_co_get_allocated_file_size =3D raw_co_get_allocated_file_size, }; =20 static void bdrv_file_init(void) diff --git a/block/parallels.c b/block/parallels.c index 013684801a..62bbaf6887 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -917,23 +917,23 @@ static void parallels_close(BlockDriverState *bs) } =20 static BlockDriver bdrv_parallels =3D { - .format_name =3D "parallels", - .instance_size =3D sizeof(BDRVParallelsState), - .bdrv_probe =3D parallels_probe, - .bdrv_open =3D parallels_open, - .bdrv_close =3D parallels_close, - .bdrv_child_perm =3D bdrv_default_perms, - .bdrv_co_block_status =3D parallels_co_block_status, - .bdrv_has_zero_init =3D bdrv_has_zero_init_1, - .bdrv_co_flush_to_os =3D parallels_co_flush_to_os, - .bdrv_co_readv =3D parallels_co_readv, - .bdrv_co_writev =3D parallels_co_writev, - .is_format =3D true, - .supports_backing =3D true, - .bdrv_co_create =3D parallels_co_create, - .bdrv_co_create_opts =3D parallels_co_create_opts, - .bdrv_co_check =3D parallels_co_check, - .create_opts =3D ¶llels_create_opts, + .format_name =3D "parallels", + .instance_size =3D sizeof(BDRVParallelsState), + .bdrv_probe =3D parallels_probe, + .bdrv_open =3D parallels_open, + .bdrv_close =3D parallels_close, + .bdrv_child_perm =3D bdrv_default_perms, + .bdrv_co_block_status =3D parallels_co_block_status, + .bdrv_has_zero_init =3D bdrv_has_zero_init_1, + .bdrv_co_flush_to_os =3D parallels_co_flush_to_os, + .bdrv_co_readv =3D parallels_co_readv, + .bdrv_co_writev =3D parallels_co_writev, + .is_format =3D true, + .supports_backing =3D true, + .bdrv_co_create =3D parallels_co_create, + .bdrv_co_create_opts =3D parallels_co_create_opts, + .bdrv_co_check =3D parallels_co_check, + .create_opts =3D ¶llels_create_opts, }; =20 static void bdrv_parallels_init(void) diff --git a/block/qcow.c b/block/qcow.c index 490e4f819e..62b916db6d 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -1177,30 +1177,30 @@ static const char *const qcow_strong_runtime_opts[]= =3D { }; =20 static BlockDriver bdrv_qcow =3D { - .format_name =3D "qcow", - .instance_size =3D sizeof(BDRVQcowState), - .bdrv_probe =3D qcow_probe, - .bdrv_open =3D qcow_open, - .bdrv_close =3D qcow_close, - .bdrv_child_perm =3D bdrv_default_perms, - .bdrv_reopen_prepare =3D qcow_reopen_prepare, - .bdrv_co_create =3D qcow_co_create, - .bdrv_co_create_opts =3D qcow_co_create_opts, - .bdrv_has_zero_init =3D bdrv_has_zero_init_1, - .is_format =3D true, - .supports_backing =3D true, - .bdrv_refresh_limits =3D qcow_refresh_limits, - - .bdrv_co_preadv =3D qcow_co_preadv, - .bdrv_co_pwritev =3D qcow_co_pwritev, - .bdrv_co_block_status =3D qcow_co_block_status, - - .bdrv_make_empty =3D qcow_make_empty, + .format_name =3D "qcow", + .instance_size =3D sizeof(BDRVQcowState), + .bdrv_probe =3D qcow_probe, + .bdrv_open =3D qcow_open, + .bdrv_close =3D qcow_close, + .bdrv_child_perm =3D bdrv_default_perms, + .bdrv_reopen_prepare =3D qcow_reopen_prepare, + .bdrv_co_create =3D qcow_co_create, + .bdrv_co_create_opts =3D qcow_co_create_opts, + .bdrv_has_zero_init =3D bdrv_has_zero_init_1, + .is_format =3D true, + .supports_backing =3D true, + .bdrv_refresh_limits =3D qcow_refresh_limits, + + .bdrv_co_preadv =3D qcow_co_preadv, + .bdrv_co_pwritev =3D qcow_co_pwritev, + .bdrv_co_block_status =3D qcow_co_block_status, + + .bdrv_make_empty =3D qcow_make_empty, .bdrv_co_pwritev_compressed =3D qcow_co_pwritev_compressed, - .bdrv_co_get_info =3D qcow_co_get_info, + .bdrv_co_get_info =3D qcow_co_get_info, =20 - .create_opts =3D &qcow_create_opts, - .strong_runtime_opts =3D qcow_strong_runtime_opts, + .create_opts =3D &qcow_create_opts, + .strong_runtime_opts =3D qcow_strong_runtime_opts, }; =20 static void bdrv_qcow_init(void) diff --git a/include/block/nbd.h b/include/block/nbd.h index a4c98169c3..4f5803fd9b 100644 --- a/include/block/nbd.h +++ b/include/block/nbd.h @@ -224,7 +224,7 @@ enum { NBD_CMD_BLOCK_STATUS =3D 7, }; =20 -#define NBD_DEFAULT_PORT 10809 +#define NBD_DEFAULT_PORT 10809 =20 /* Maximum size of a single READ/WRITE data buffer */ #define NBD_MAX_BUFFER_SIZE (32 * 1024 * 1024) --=20 2.32.0 (Apple Git-132)