From nobody Mon Feb 9 12:11:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1618587523; cv=none; d=zohomail.com; s=zohoarc; b=aU+rZSSIvPNIuoDEzJ0eiITqJdM+eTjyoIsrR+FgsoHsc/q3VKGhsrqbsj22u5tb//X6OPT8CZ8VW64so6HNWmwnsW2WhLuvrta2eiaOy4/UFk+2SF2jkzFoqJMXEjon6Haxb96JbgmBb6UWico9Qg+MxioLZSOu832eHU/1B2o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618587523; 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=npdOc9FzGMQXWtPL1x1Mu/zmnz30dfUqk24V+9i+Oeo=; b=OTGb2MbjWAYGSEr7fKC8045MDyxBdPuhC222J/o+ENI8KdJI9Z/dXdFroBEikAjfs+xpOXHJAxMZjCGj+RWa8nnxaD1TbJtoQhaDl2LB39uHgAS6s0Yufw75BCVHnb//r821C/MSue13dfZ2W8O/8dUOV2zwDucW6ivLtxpfCHE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1618587523921207.92592134575943; Fri, 16 Apr 2021 08:38:43 -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-325-RmRvJihKOjerKELdJtViLA-1; Fri, 16 Apr 2021 11:38:40 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2ADEF84BA69; Fri, 16 Apr 2021 15:38:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0A75B60861; Fri, 16 Apr 2021 15:38:34 +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 C96191806D18; Fri, 16 Apr 2021 15:38:33 +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 13GFZC7r009395 for ; Fri, 16 Apr 2021 11:35:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id D3CC85C3DF; Fri, 16 Apr 2021 15:35:12 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17D9D5C257 for ; Fri, 16 Apr 2021 15:35:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618587522; 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=npdOc9FzGMQXWtPL1x1Mu/zmnz30dfUqk24V+9i+Oeo=; b=flUcMWTijhIDfaz5NlPe+fxbkbTQgy5go9a/Mjv/Ta6H01wak3QGKyUFKWvwqJ7erI2Wpp JQ3+8S3ntvOJDhj6WGdkihWB/shYrQ3UVQEsm881Iab/zLognA4Z2ddyAyoRQ0x0xaLTKJ NqsrT5UDgok6JAtjlP+uRWrgd22N4PU= X-MC-Unique: RmRvJihKOjerKELdJtViLA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 15/25] vmx: Mark CDROM disk elements as read-only Date: Fri, 16 Apr 2021 17:34:33 +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.13 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" Mark it explicitly as read only in accordance with the comment outlining configuration. Signed-off-by: Peter Krempa --- src/vmx/vmx.c | 3 +++ tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml | 1 + tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml | 1 + tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml | 3 +++ tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml | 1 + tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml | 1 + tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml | 1 + tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml | 1 + tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml | 1 + tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml | 1 + tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml | 1 + tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml | 1 + 22 files changed, 26 insertions(+) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 7aa76c0055..65d2850f2c 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2411,6 +2411,9 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptio= n *xmlopt, virConf *conf, goto cleanup; } } else if (device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM) { + /* set cdrom to read-only */ + (*def)->src->readonly =3D true; + if (fileName && virStringHasCaseSuffix(fileName, ".vmdk")) { /* * This function was called in order to parse a CDROM device, = but diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml b/tests/vmx2xml= data/vmx2xml-cdrom-ide-device.xml index e5a242d1f4..8e67347e7d 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml @@ -15,6 +15,7 @@ +
diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.xml b/tests/vmx2xm= ldata/vmx2xml-cdrom-ide-empty-2.xml index 6af0ee0704..406c3e9cc0 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.xml @@ -14,6 +14,7 @@ +
diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml b/tests/vmx2xmld= ata/vmx2xml-cdrom-ide-empty.xml index 93670e7eb4..0c37b64dbb 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml @@ -14,6 +14,7 @@ +
diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml b/tests/vmx2xmlda= ta/vmx2xml-cdrom-ide-file.xml index 98548e9da8..03d8eaec8e 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml @@ -15,6 +15,7 @@ +
diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml b/test= s/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml index 392d580ffa..87bf2ee847 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml @@ -15,6 +15,7 @@ +
diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml b/tests/vmx= 2xmldata/vmx2xml-cdrom-ide-raw-device.xml index c7cba73aa8..764443f4fe 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml @@ -15,6 +15,7 @@ +
diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml b/tests/vmx2xm= ldata/vmx2xml-cdrom-scsi-device.xml index 9e5a985788..48453d4a3c 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml @@ -15,6 +15,7 @@ +
diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml b/tests/vmx2xml= data/vmx2xml-cdrom-scsi-empty.xml index 3678ef38b0..a972a4f538 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml @@ -14,6 +14,7 @@ +
diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml b/tests/vmx2xmld= ata/vmx2xml-cdrom-scsi-file.xml index e79927ada8..977655cb53 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml @@ -15,6 +15,7 @@ +
diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml b/tests/vmx2= xmldata/vmx2xml-cdrom-scsi-passthru.xml index b851e73b3b..c9445a1754 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml @@ -15,6 +15,7 @@ +
diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml b/tes= ts/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml index 497066972d..41f33885a6 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml @@ -15,6 +15,7 @@ +
diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml b/tests/vm= x2xmldata/vmx2xml-cdrom-scsi-raw-device.xml index d7d881e4a6..3d541cb14b 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml @@ -15,6 +15,7 @@ +
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml b/tests/vmx2xm= ldata/vmx2xml-esx-in-the-wild-2.xml index b079808363..59071b5d3a 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml @@ -21,16 +21,19 @@ +
+
+
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml b/tests/vmx2xm= ldata/vmx2xml-esx-in-the-wild-3.xml index d05318c7d8..cbe8eceb37 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml @@ -20,6 +20,7 @@ +
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml b/tests/vmx2xm= ldata/vmx2xml-esx-in-the-wild-5.xml index 82643e9ffe..9eb975afe9 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml @@ -27,6 +27,7 @@ +
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml b/tests/vmx2xm= ldata/vmx2xml-esx-in-the-wild-6.xml index 913bfedf30..51c74dd8a1 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml @@ -20,6 +20,7 @@ +
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml b/tests/vmx2xm= ldata/vmx2xml-esx-in-the-wild-7.xml index 91913a2918..c117bd62e5 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml @@ -20,6 +20,7 @@ +
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml b/tests/vmx2xm= ldata/vmx2xml-esx-in-the-wild-8.xml index 32affb5935..0eea610709 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml @@ -37,6 +37,7 @@ +
diff --git a/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml b/tests/vmx= 2xmldata/vmx2xml-fusion-in-the-wild-1.xml index f6e9f4acdf..a47fab5cd5 100644 --- a/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml +++ b/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml @@ -20,6 +20,7 @@ +
diff --git a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml b/tests/vmx2xml= data/vmx2xml-ws-in-the-wild-1.xml index 9901033bb9..5dcc6eb48e 100644 --- a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml +++ b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml @@ -20,6 +20,7 @@ +
diff --git a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml b/tests/vmx2xml= data/vmx2xml-ws-in-the-wild-2.xml index 6f8f30393c..dfabb16e58 100644 --- a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml +++ b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml @@ -20,6 +20,7 @@ +
--=20 2.30.2