From nobody Wed Mar 12 17:16:56 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1741601102598893.3327484454628; Mon, 10 Mar 2025 03:05:02 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E8FC31C03; Mon, 10 Mar 2025 06:05:01 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D46391BA4; Mon, 10 Mar 2025 06:03:15 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E709C1584; Mon, 10 Mar 2025 06:03:09 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 443E71594 for ; Mon, 10 Mar 2025 06:03:09 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-695-6hhbty-VNou2DrbIOXARzA-1; Mon, 10 Mar 2025 06:03:07 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1B247180025E for ; Mon, 10 Mar 2025 10:03:07 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.5]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5FFDC1801750 for ; Mon, 10 Mar 2025 10:03:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741600989; h=from:from: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; bh=UCSE0eqavHAWC1y0pQHhswIxxw8MowrfP29WLs5y/kY=; b=Rf1Aa8nLLExdN0xEQt1uWonUmR4H9aM2WKX+tC5CxywstfE4cyB5tjNlgNBa/NSDuh4qOk tGyS7mDhhrSzxRAps7KARiQZNgAfm6DxKwxUiQ4ci7l+Eyaq7xU4V/6LVgGvlrcigPtlvn e+ast5/udCEoSAPIjN4ewiL88duHSTA= X-MC-Unique: 6hhbty-VNou2DrbIOXARzA-1 X-Mimecast-MFC-AGG-ID: 6hhbty-VNou2DrbIOXARzA_1741600987 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 01/16] conf: Drop support for 'sheepdog' disks Date: Mon, 10 Mar 2025 11:02:48 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: rgOSbCH5KscP7Zshj6SkFzOtEGcoAE2dLqC7H4uU8FA_1741600987 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: RMFS5L6AAVJAY643V3ICGESFWWT2Z5LP X-Message-ID-Hash: RMFS5L6AAVJAY643V3ICGESFWWT2Z5LP X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741601105418019000 Content-Type: text/plain; charset="utf-8" In upcoming patches we'll update minimum supported qemu version to qemu-6.2 which no longer supports 'sheepdog'. This was the only hypervisor driver that supported it. Reject any config containing sheepdog disks when validating the XML, remove the positive test cases in qemu and replace them by a negative test case. This will still excercise the XML schema, but will prepare for removal of the internal code. Signed-off-by: Peter Krempa --- src/conf/domain_validate.c | 7 +++ tests/qemusecuritytest.c | 1 - .../disk-network-sheepdog.x86_64-6.0.0.args | 39 ---------------- .../disk-network-sheepdog.x86_64-6.0.0.xml | 46 ------------------- .../disk-network-sheepdog.x86_64-latest.err | 1 + tests/qemuxmlconftest.c | 3 +- 6 files changed, 9 insertions(+), 88 deletions(-) delete mode 100644 tests/qemuxmlconfdata/disk-network-sheepdog.x86_64-6.0.= 0.args delete mode 100644 tests/qemuxmlconfdata/disk-network-sheepdog.x86_64-6.0.= 0.xml create mode 100644 tests/qemuxmlconfdata/disk-network-sheepdog.x86_64-late= st.err diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index ad3d17f0fd..5e2bbb1d9f 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -476,6 +476,13 @@ virDomainDiskDefValidateSourceChainOne(const virStorag= eSource *src) { virStorageType actualType =3D virStorageSourceGetActualType(src); + if (virStorageSourceGetActualType(src) =3D=3D VIR_STORAGE_TYPE_NETWORK= && + src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_SHEEPDOG) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'sheepdog' protocol is no longer supported by an= y hypervisor driver")); + return -1; + } + if (src->type =3D=3D VIR_STORAGE_TYPE_NETWORK && src->auth) { virStorageAuthDef *authdef =3D src->auth; int actUsage; diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c index 27eb101f8c..88c8617d69 100644 --- a/tests/qemusecuritytest.c +++ b/tests/qemusecuritytest.c @@ -219,7 +219,6 @@ mymain(void) DO_TEST_DOMAIN("disk-network-iscsi"); DO_TEST_DOMAIN("disk-network-nbd"); DO_TEST_DOMAIN("disk-network-rbd"); - DO_TEST_DOMAIN("disk-network-sheepdog"); DO_TEST_DOMAIN("disk-network-source-auth"); DO_TEST_DOMAIN("disk-network-tlsx509-nbd"); DO_TEST_DOMAIN("disk-readonly-disk"); diff --git a/tests/qemuxmlconfdata/disk-network-sheepdog.x86_64-6.0.0.args = b/tests/qemuxmlconfdata/disk-network-sheepdog.x86_64-6.0.0.args deleted file mode 100644 index 664c47acf7..0000000000 --- a/tests/qemuxmlconfdata/disk-network-sheepdog.x86_64-6.0.0.args +++ /dev/null @@ -1,39 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc-i440fx-6.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ --accel tcg \ --cpu qemu64 \ --m size=3D219136k \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMU,Guest,,1",= "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1 \ --blockdev '{"driver":"sheepdog","server":{"type":"inet","host":"example.or= g","port":"6000"},"vdi":"image,with,commas","node-name":"libvirt-1-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/disk-network-sheepdog.x86_64-6.0.0.xml b= /tests/qemuxmlconfdata/disk-network-sheepdog.x86_64-6.0.0.xml deleted file mode 100644 index 3421293663..0000000000 --- a/tests/qemuxmlconfdata/disk-network-sheepdog.x86_64-6.0.0.xml +++ /dev/null @@ -1,46 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - qemu64 - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - - - - -
- - - - - - - -
- - -
- - -
- - - - -