From nobody Fri Dec 19 06:00:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602708283; cv=none; d=zohomail.com; s=zohoarc; b=HzNJpTfrL4NhOj3nKOWdtfxX6Fx+stSk0dNjvkvojM+N4fRNOyEdjz4XkGubFKzX5w+t1hJ7I2FVKDCgqHCeAuLL/jasjFeXz1nwjpEX+c1NSzreLz/6+ah5+LgvyvLNDGWPDIH8ywSzMTU5ak1agGxlUjmGnJ3u0xwKhCuST9I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602708283; h=Content-Type:Content-Transfer-Encoding:Cc: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=Q6hvAzltDbF8yrv3Vh0gXx5vjNxzSMR5Ty5kCUYIq2g=; b=VQVwkaQ/RcRLW1tHacYQ4a/Ixy/rUgpDe27xWS/8fRgzOkYCv4TSn8FClF44hav9NXob5DCM3fZn6QKpI/Ol3prbyDYupzlQdwA7ssLbOz/4Ka+AMAu0VjtdpoZYIGlOGzl3/yMhjIPWEKAQXR02uD9mqPsOvBOhsoWVgT+H5YE= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602708283531498.0378188219846; Wed, 14 Oct 2020 13:44: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-426-fLeA-BSmN2W0r6-kb037nA-1; Wed, 14 Oct 2020 16:44:40 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0E542107AFB7; Wed, 14 Oct 2020 20:44: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 902975C1BD; Wed, 14 Oct 2020 20:44:33 +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 5A818181A71E; Wed, 14 Oct 2020 20:44:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09EKhU1R028607 for ; Wed, 14 Oct 2020 16:43:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3E0F11711D7; Wed, 14 Oct 2020 20:43:30 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 373451711D8 for ; Wed, 14 Oct 2020 20:43:28 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E5AC8182360B for ; Wed, 14 Oct 2020 20:43:27 +0000 (UTC) Received: from mail-io1-f54.google.com (mail-io1-f54.google.com [209.85.166.54]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-308-o3rJ2RumPNCI0c5aenJVvA-1; Wed, 14 Oct 2020 16:43:25 -0400 Received: by mail-io1-f54.google.com with SMTP id n6so902671ioc.12 for ; Wed, 14 Oct 2020 13:43:25 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:5a9b:54fc:df2a:8a5e:989b]) by smtp.gmail.com with ESMTPSA id i4sm492202ilc.27.2020.10.14.13.43.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2020 13:43:24 -0700 (PDT) X-MC-Unique: fLeA-BSmN2W0r6-kb037nA-1 X-MC-Unique: o3rJ2RumPNCI0c5aenJVvA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q6hvAzltDbF8yrv3Vh0gXx5vjNxzSMR5Ty5kCUYIq2g=; b=oOo9c4ZnwRvCqvL4Mk9ix4dziBi8y8ef0UZv5nP8N7QadrvQM5Qm3Qi6ovQ3riq1gV XLux6oMoGisXEVtpfGJQpYyzhHTJbknNP9l0D/aeglvI5l8J4ffx7YDGqLApNTnlGwTY XjfxzhFE4OX7eu9+IaFnSjKqYIbvQAJKybtZQoawJZrY+x2x30EjQJi5N6FCuJIkNbrQ qdW0FXVjWcczCQn5D23XqFDY/m3xycK/2jC0pbB71YNj+UyXRBMq3WW+pITNurlLce8/ UeUCysEhuMGvcnQsnx9LQEPCC+apKdvu0D9iiJ8hWopuVJPxzyAEFSTDK20PoZaDzfkD S/vA== X-Gm-Message-State: AOAM5335b2eHVps+aHHV4Y3wO53VxC4IuCRVgOkpnsq42Q2Kf0LHDw9Q Er0+JCpW8dfBfxdtPQ4dhdAHAk3WAgs= X-Google-Smtp-Source: ABdhPJx6w+ZK4BhuT44A1A4ojjjIbUbO6J258sVrnwqPgjttdSh3H4e7WlO+rbjJlohK5NhKQ2ik4w== X-Received: by 2002:a02:6045:: with SMTP id d5mr1096834jaf.144.1602708204629; Wed, 14 Oct 2020 13:43:24 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH v1 02/24] qemu_command.c: move LUN and IDE checks to qemu_validate.c Date: Wed, 14 Oct 2020 17:42:45 -0300 Message-Id: <20201014204307.631746-3-danielhb413@gmail.com> In-Reply-To: <20201014204307.631746-1-danielhb413@gmail.com> References: <20201014204307.631746-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza 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.16 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 Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_command.c | 15 --------------- src/qemu/qemu_validate.c | 14 ++++++++++++++ tests/qemuxml2xmltest.c | 12 +++++++++--- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5a693e143f..b8b5ac1246 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1561,12 +1561,6 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, =20 switch ((virDomainDiskBus) disk->bus) { case VIR_DOMAIN_DISK_BUS_IDE: - if (disk->info.addr.drive.target !=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("target must be 0 for ide controller")); - return NULL; - } - if (disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM) virBufferAddLit(&opt, "ide-cd"); else @@ -1590,15 +1584,6 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, break; =20 case VIR_DOMAIN_DISK_BUS_SCSI: - if (disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_LUN) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_BLOCK)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("This QEMU doesn't support scsi-block for= " - "lun passthrough")); - return NULL; - } - } - controllerModel =3D qemuDomainFindSCSIControllerModel(def, &disk->= info); if (controllerModel < 0) return NULL; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index e747ce2cb0..10c770d318 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2112,6 +2112,15 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDom= ainDiskDef *disk, return -1; } =20 + if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_SCSI && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_BLOCK)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU doesn't support scsi-block for " + "lun passthrough")); + return -1; + } + + if (disk->copy_on_read =3D=3D VIR_TRISTATE_SWITCH_ON) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("copy_on_read is not compatible with 'lun' di= sk '%s'"), @@ -2165,6 +2174,11 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDom= ainDiskDef *disk, _("Only 1 IDE controller is supported")); return -1; } + if (disk->info.addr.drive.target !=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("target must be 0 for ide controller")); + return -1; + } break; =20 case VIR_DOMAIN_DISK_BUS_FDC: diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2bf8dd5b14..d8040e8871 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -344,7 +344,8 @@ mymain(void) DO_TEST_CAPS_VER("disk-cache", "2.12.0"); DO_TEST_CAPS_LATEST("disk-cache"); DO_TEST("disk-network-nbd", NONE); - DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI); + DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI, + QEMU_CAPS_SCSI_BLOCK); DO_TEST("disk-network-gluster", NONE); DO_TEST("disk-network-rbd", NONE); DO_TEST("disk-network-source-auth", NONE); @@ -355,7 +356,9 @@ mymain(void) DO_TEST("disk-nvme", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_QCOW2_LUKS); DO_TEST_CAPS_LATEST("disk-scsi"); DO_TEST("disk-virtio-scsi-reservations", - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_PR_MANAGER_HELPER); + QEMU_CAPS_VIRTIO_SCSI, + QEMU_CAPS_PR_MANAGER_HELPER, + QEMU_CAPS_SCSI_BLOCK); DO_TEST("controller-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-s390-zpci", QEMU_CAPS_DEVICE_ZPCI, @@ -660,7 +663,10 @@ mymain(void) DO_TEST("numad-static-vcpu-no-numatune", NONE); =20 DO_TEST("disk-scsi-lun-passthrough-sgio", - QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK= _WWN); + QEMU_CAPS_SCSI_LSI, + QEMU_CAPS_VIRTIO_SCSI, + QEMU_CAPS_SCSI_DISK_WWN, + QEMU_CAPS_SCSI_BLOCK); DO_TEST("disk-scsi-disk-vpd", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK= _WWN); DO_TEST("disk-source-pool", NONE); --=20 2.26.2