{"id":2222014,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2222014/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260410152314.86412-2-kwolf@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260410152314.86412-2-kwolf@redhat.com>","date":"2026-04-10T15:23:13","name":"[1/2] block: Create DEFAULT_BLOCK_CONF macro","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"16135827dab13d05dc0929051318a9a1c4673920","submitter":{"id":2714,"url":"http://patchwork.ozlabs.org/api/1.1/people/2714/?format=json","name":"Kevin Wolf","email":"kwolf@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260410152314.86412-2-kwolf@redhat.com/mbox/","series":[{"id":499481,"url":"http://patchwork.ozlabs.org/api/1.1/series/499481/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=499481","date":"2026-04-10T15:23:12","name":"scsi: Fix discard_granularity for -drive if=scsi","version":1,"mbox":"http://patchwork.ozlabs.org/series/499481/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2222014/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222014/checks/","tags":{},"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=I8Jqmk7M;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fsgcF2GcYz1y2d\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 11 Apr 2026 01:25:49 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1wBDik-0001me-Ue; Fri, 10 Apr 2026 11:24:35 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <kwolf@redhat.com>) id 1wBDiR-0001iX-1e\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 11:24:15 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.129.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <kwolf@redhat.com>) id 1wBDiL-00089q-K3\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 11:24:14 -0400","from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-673-ahZQ4oONNRKpHtMZq08dCA-1; Fri,\n 10 Apr 2026 11:24:00 -0400","from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 48CFB1955E80; Fri, 10 Apr 2026 15:23:59 +0000 (UTC)","from merkur.redhat.com (unknown [10.44.49.176])\n by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id C09EB19560AB; Fri, 10 Apr 2026 15:23:56 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1775834644;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=ufml1BFTV3h7PQpNssX0iYrDnD+YkVaxJC2tzBuM/8k=;\n b=I8Jqmk7MG87JcOLHe6mdo7o1aT6YuIZyb3EyzTzuTzOx2ns4xV6FQeSu66FM7VqpJesTun\n OXk2OqZ2g5g7nyTJ3s7OYOmRBoicU1Lsew3kvL3IJP9gPpIlFSxp2ZFgqSdz3bk/Lietlv\n USIrRRcGp9iS55Tos4IT/5/72v4g8YY=","X-MC-Unique":"ahZQ4oONNRKpHtMZq08dCA-1","X-Mimecast-MFC-AGG-ID":"ahZQ4oONNRKpHtMZq08dCA_1775834639","From":"Kevin Wolf <kwolf@redhat.com>","To":"qemu-block@nongnu.org","Cc":"kwolf@redhat.com, hreitz@redhat.com, ivy@FreeBSD.org, pbonzini@redhat.com,\n fam@euphon.net, qemu-devel@nongnu.org, qemu-stable@nongnu.org","Subject":"[PATCH 1/2] block: Create DEFAULT_BLOCK_CONF macro","Date":"Fri, 10 Apr 2026 17:23:13 +0200","Message-ID":"<20260410152314.86412-2-kwolf@redhat.com>","In-Reply-To":"<20260410152314.86412-1-kwolf@redhat.com>","References":"<20260410152314.86412-1-kwolf@redhat.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.17","Received-SPF":"pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"7","X-Spam_score":"0.7","X-Spam_bar":"/","X-Spam_report":"(0.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.54,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,\n RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001,\n SPF_PASS=-0.001 autolearn=no autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development <qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<https://lists.nongnu.org/archive/html/qemu-devel>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"The property default values from include/hw/block/block.h were\nduplicated in scsi_bus_legacy_handle_cmdline(), allowing them to go out\nof sync easily. There doesn't seem a good way to avoid the duplication,\nbut moving them next to each other in the header file should help to\navoid this problem in the future.\n\nSigned-off-by: Kevin Wolf <kwolf@redhat.com>\n---\n include/hw/block/block.h | 7 +++++++\n hw/scsi/scsi-bus.c       | 7 +------\n 2 files changed, 8 insertions(+), 6 deletions(-)","diff":"diff --git a/include/hw/block/block.h b/include/hw/block/block.h\nindex 7dc19d8a453..e0a427039ee 100644\n--- a/include/hw/block/block.h\n+++ b/include/hw/block/block.h\n@@ -51,6 +51,13 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf)\n     return exp;\n }\n \n+#define DEFAULT_BLOCK_CONF (BlockConf) {                                \\\n+    .bootindex = -1,                                                    \\\n+    .share_rw = false,                                                  \\\n+    .rerror = BLOCKDEV_ON_ERROR_AUTO,                                   \\\n+    .werror = BLOCKDEV_ON_ERROR_AUTO,                                   \\\n+}\n+\n #define DEFINE_BLOCK_PROPERTIES_BASE(_state, _conf)                     \\\n     DEFINE_PROP_ON_OFF_AUTO(\"backend_defaults\", _state,                 \\\n                             _conf.backend_defaults, ON_OFF_AUTO_AUTO),  \\\ndiff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c\nindex 1a6b181b9d6..dccb2f25b2a 100644\n--- a/hw/scsi/scsi-bus.c\n+++ b/hw/scsi/scsi-bus.c\n@@ -485,12 +485,7 @@ void scsi_bus_legacy_handle_cmdline(SCSIBus *bus)\n     Location loc;\n     DriveInfo *dinfo;\n     int unit;\n-    BlockConf conf = {\n-        .bootindex = -1,\n-        .share_rw = false,\n-        .rerror = BLOCKDEV_ON_ERROR_AUTO,\n-        .werror = BLOCKDEV_ON_ERROR_AUTO,\n-    };\n+    BlockConf conf = DEFAULT_BLOCK_CONF;\n \n     loc_push_none(&loc);\n     for (unit = 0; unit <= bus->info->max_target; unit++) {\n","prefixes":["1/2"]}