From nobody Sun May 19 03:02:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1692874642; cv=none; d=zohomail.com; s=zohoarc; b=KEjVkuL+G5Epgc3qlJIa6bnMEYifbxeqKljfeCH+hwzW6ZnPDZtT5fxHoruGFeu7SE22/tTfoNW8hidB3HBNCEEHe4S4dIRM4bpwyOsLLXLftIvZ4FQh1/nexZRS5uSLkJsi7GGisJ/s//k3NExUVPOVOpPF+UMX6mfQob1+wV0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692874642; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=mNevOlF3wmP6ICSZcIdpz4IzgqZ6hElJ6CUcpNO7414=; b=i3tfA23y/VnU/wCArCs0WlW6Cku0CcOOvI3F1X/ZY60Alahcf/cghC+RaxL4Mb+gxemfhGsu+b7SlPNjFgBd1aun8YfTUO84sn2BI75xi0Dps3ELXL9xRcNjUquLQ9CMxvofb5VwWFzQnHVdKpyZNr7LWoPI85w7q26YWSH4H6U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1692874642765368.4367175617341; Thu, 24 Aug 2023 03:57:22 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-633-8XnNcpK3MwCXbeDuOG80uQ-1; Thu, 24 Aug 2023 06:57:19 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 916873C14AA3; Thu, 24 Aug 2023 10:57:17 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id CB64B2166B26; Thu, 24 Aug 2023 10:57:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3E1E0194658C; Thu, 24 Aug 2023 10:57:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 93AA71946589 for ; Thu, 24 Aug 2023 10:57:11 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7D4922166B26; Thu, 24 Aug 2023 10:57:11 +0000 (UTC) Received: from fedora.. (unknown [10.43.2.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 257B52166B27 for ; Thu, 24 Aug 2023 10:57:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692874641; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=mNevOlF3wmP6ICSZcIdpz4IzgqZ6hElJ6CUcpNO7414=; b=Cqf0V1arb5Zym8iAh6eqYONZLmJ/nEAOoCu/aSyjslTUXbcHoW31Wm6hZf6P/OJMZFLh4F zvHRc3KwQJrVpDLG9rfQoSfRFUCQX8fA2flaESXip9WqewAz17YtN/8T1PoxWSSzPYjsQ7 w3Br1zoiIQlh23f3QPH2zsEPa1aCPdg= X-MC-Unique: 8XnNcpK3MwCXbeDuOG80uQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH] conf: add virDomainDiskBlockIoCheckABIStability() Date: Thu, 24 Aug 2023 12:57:00 +0200 Message-ID: <93e2c95e24bc6b84c5d1ad04ed47c52f70cb78db.1692874609.git.khanicov@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692874643129100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Add missing ABI stability check for blockio properties for disk devices. Signed-off-by: Kristina Hanicova Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2e60927799..71bd49bf95 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19775,6 +19775,28 @@ virDomainVirtioOptionsCheckABIStability(virDomainV= irtioOptions *src, } =20 =20 +static bool +virDomainDiskBlockIoCheckABIStability(virDomainDiskDef *src, + virDomainDiskDef *dst) +{ + if (src->blockio.logical_block_size !=3D dst->blockio.logical_block_si= ze) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target disk logical_block_size %1$u does not mat= ch source %2$u"), + dst->blockio.logical_block_size, src->blockio.logic= al_block_size); + return false; + } + + if (src->blockio.physical_block_size !=3D dst->blockio.physical_block_= size) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target disk physical_block_size %1$u does not ma= tch source %2$u"), + dst->blockio.physical_block_size, src->blockio.phys= ical_block_size); + return false; + } + return true; +} + + + static bool virDomainDiskDefCheckABIStability(virDomainDiskDef *src, virDomainDiskDef *dst) @@ -19858,6 +19880,9 @@ virDomainDiskDefCheckABIStability(virDomainDiskDef = *src, if (!virDomainDeviceInfoCheckABIStability(&src->info, &dst->info)) return false; =20 + if (!virDomainDiskBlockIoCheckABIStability(src, dst)) + return false; + return true; } =20 --=20 2.41.0