From nobody Mon Feb 9 03:46:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1618587525; cv=none; d=zohomail.com; s=zohoarc; b=nP/iVLhC7cqfrr3yEre8hhaul+vOw7ALfihBMtQ2xzx30SRvY/q8PiyrQVmg0jXjODa4tIVjV2XobUFdqxmh3J4pPYW120pTFBqT9AJIGSUlLve6oKguMAYpaVIhhOsqYSE0e3ePmm9fXuGr00MjkC7USUCgB7/JzrmXg/Hklic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618587525; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=W2qEwYvIH1U7piJkqhCoz/hIoCXkcoc5ub07uBgwU8w=; b=bUIq3t7MAk68E81/QVwpuNdW0fKosAFHbZwENrOcAyZfuMxWBazCsNX7JWKmuxHy8wWIf79eSok3e5jpVQKC9ZnngRknFbXni/m6SulF23pdsjLGZ5YBVQNRLCRZEBvsUzNyDco5XaxmfZw6bnS3E5KzYvP1rkJZNIh3aaAXiRs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1618587525424684.540050011512; Fri, 16 Apr 2021 08:38:45 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-102-Z5EjwZcQO62pg1PwsVynGQ-1; Fri, 16 Apr 2021 11:38:41 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 06A8F84BA55; Fri, 16 Apr 2021 15:38:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D568860BE5; Fri, 16 Apr 2021 15:38:36 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9C11C44A5E; Fri, 16 Apr 2021 15:38:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13GFZDiY009402 for ; Fri, 16 Apr 2021 11:35:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id DDDB25C260; Fri, 16 Apr 2021 15:35:13 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 40EE15C257 for ; Fri, 16 Apr 2021 15:35:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618587524; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=W2qEwYvIH1U7piJkqhCoz/hIoCXkcoc5ub07uBgwU8w=; b=i6s8pb4jJBOUZys16+iWma3/F5Mz+iRMXb8+UKzxbiEb5KXoHCpHd6E+wxk3Y1c25o+cUY irs1Yg41Al5YxXP25vDkg5Jo3S9ABJ0L/GLrbq6l7arzw9unA/fscKYcxeTmQHc8ZuJ3wb fiiD5B7EUtrTx9Vm2PhGDPsxjYlXRBI= X-MC-Unique: Z5EjwZcQO62pg1PwsVynGQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 16/25] conf: domain: Move default setting from virDomainDiskDefParseXML to virDomainDiskDefPostParse Date: Fri, 16 Apr 2021 17:34:34 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Move the setting of read-only state, the default disk bus and setting of 'snapshot' state for read-only disks to the post parse callback to clean up the disk parser. Signed-off-by: Peter Krempa --- src/conf/domain_conf.c | 50 +++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c600c1e6b1..867d74f31f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5378,6 +5378,33 @@ virDomainDiskDefPostParse(virDomainDiskDef *disk, } } + /* Force CDROM to be listed as read only */ + if (disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM) + disk->src->readonly =3D true; + + if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_NONE) { + disk->bus =3D VIR_DOMAIN_DISK_BUS_IDE; + + if (disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_FLOPPY) { + disk->bus =3D VIR_DOMAIN_DISK_BUS_FDC; + } else if (disk->dst) { + if (STRPREFIX(disk->dst, "hd")) + disk->bus =3D VIR_DOMAIN_DISK_BUS_IDE; + else if (STRPREFIX(disk->dst, "sd")) + disk->bus =3D VIR_DOMAIN_DISK_BUS_SCSI; + else if (STRPREFIX(disk->dst, "vd")) + disk->bus =3D VIR_DOMAIN_DISK_BUS_VIRTIO; + else if (STRPREFIX(disk->dst, "xvd")) + disk->bus =3D VIR_DOMAIN_DISK_BUS_XEN; + else if (STRPREFIX(disk->dst, "ubd")) + disk->bus =3D VIR_DOMAIN_DISK_BUS_UML; + } + } + + if (disk->snapshot =3D=3D VIR_DOMAIN_SNAPSHOT_LOCATION_DEFAULT && + disk->src->readonly) + disk->snapshot =3D VIR_DOMAIN_SNAPSHOT_LOCATION_NONE; + if (disk->src->type =3D=3D VIR_STORAGE_TYPE_NETWORK && disk->src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_ISCSI) { virDomainPostParseCheckISCSIPath(&disk->src->path); @@ -9465,10 +9492,6 @@ virDomainDiskDefParseXML(virDomainXMLOption *xmlopt, return NULL; } - /* Force CDROM to be listed as read only */ - if (def->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM) - def->src->readonly =3D true; - if ((def->device =3D=3D VIR_DOMAIN_DISK_DEVICE_DISK || def->device =3D=3D VIR_DOMAIN_DISK_DEVICE_LUN) && !STRPREFIX((const char *)target, "hd") && @@ -9489,8 +9512,6 @@ virDomainDiskDefParseXML(virDomainXMLOption *xmlopt, snapshot); return NULL; } - } else if (def->src->readonly) { - def->snapshot =3D VIR_DOMAIN_SNAPSHOT_LOCATION_NONE; } if (rawio) { @@ -9516,23 +9537,6 @@ virDomainDiskDefParseXML(virDomainXMLOption *xmlopt, _("unknown disk bus type '%s'"), bus); return NULL; } - } else { - if (def->device =3D=3D VIR_DOMAIN_DISK_DEVICE_FLOPPY) { - def->bus =3D VIR_DOMAIN_DISK_BUS_FDC; - } else { - if (STRPREFIX(target, "hd")) - def->bus =3D VIR_DOMAIN_DISK_BUS_IDE; - else if (STRPREFIX(target, "sd")) - def->bus =3D VIR_DOMAIN_DISK_BUS_SCSI; - else if (STRPREFIX(target, "vd")) - def->bus =3D VIR_DOMAIN_DISK_BUS_VIRTIO; - else if (STRPREFIX(target, "xvd")) - def->bus =3D VIR_DOMAIN_DISK_BUS_XEN; - else if (STRPREFIX(target, "ubd")) - def->bus =3D VIR_DOMAIN_DISK_BUS_UML; - else - def->bus =3D VIR_DOMAIN_DISK_BUS_IDE; - } } if (removable) { --=20 2.30.2