From nobody Tue Apr 23 18:26:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1554993322; cv=none; d=zoho.com; s=zohoarc; b=Wy5/eVICS6ND9CryeN5pmDACfCODe4UIAmpIsnR4KGQRhD2lTfTzAfrOpP11VmX1RP2BEcev2q23BNt/RSzGyCGf3OnaiY6lMKdNv0E9nsuoyvaygRMYyMJe7LEDy2Me6yIgZzC7jvi+PUHHt6a7JMI8FZ6Xc6ymije53h9CrYo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554993322; 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:ARC-Authentication-Results; bh=BWH8gmSzIpibfifUI/iKtiroHc/6/WZleF5ZBsuY7QI=; b=iM/hcdM/xQY8DCq2OZWGicaEIfsSKImK9TIbE3qdL99N7rRLvb58uvdN0iiiIfOJNjNAfNGlcQ2TJftW1TsuSE4tLsnHdZWU6M914mTpMYf3v1c5j3yHYkS1vCXJ4Jq0H91QBcm1MgCD3WRSb89JDeuBozenc9Z3d9SXMloMlTU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1554993322579497.5058133500304; Thu, 11 Apr 2019 07:35:22 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EA10981DE1; Thu, 11 Apr 2019 14:35:16 +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 8C7CF5B689; Thu, 11 Apr 2019 14:35:13 +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 99C783FB12; Thu, 11 Apr 2019 14:35:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3BEZ8h9006396 for ; Thu, 11 Apr 2019 10:35:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 60E561001DEA; Thu, 11 Apr 2019 14:35:08 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id B289E1001943; Thu, 11 Apr 2019 14:35:07 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Thu, 11 Apr 2019 16:34:57 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: danielhb413@gmail.com Subject: [libvirt] [PATCH 1/4] conf: Expose virDomainSCSIDriveAddressIsUsed 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 11 Apr 2019 14:35:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" This function checks if given drive address is already present in passed domain definition. Expose the function as it will be used shortly. Signed-off-by: Michal Privoznik Reviewed-by: Jim Fehlig Tested-by: Daniel Henrique Barboza --- src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 4 ++++ src/libvirt_private.syms | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bbde3788a6..bce4e65e0d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4644,7 +4644,7 @@ virDomainDriveAddressIsUsedByHostdev(const virDomainD= ef *def, * Return true if the SCSI drive address is already in use, false * otherwise. */ -static bool +bool virDomainSCSIDriveAddressIsUsed(const virDomainDef *def, const virDomainDeviceDriveAddress *addr) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 12eb71c197..fc3a8fb795 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2698,6 +2698,10 @@ virDomainXMLNamespacePtr virDomainXMLOptionGetNamespace(virDomainXMLOptionPtr xmlopt) ATTRIBUTE_NONNULL(1); =20 +bool +virDomainSCSIDriveAddressIsUsed(const virDomainDef *def, + const virDomainDeviceDriveAddress *addr); + int virDomainDefPostParse(virDomainDefPtr def, virCapsPtr caps, unsigned int parseFlags, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 6e64e77839..eb9727c299 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -535,6 +535,7 @@ virDomainRunningReasonTypeToString; virDomainSaveConfig; virDomainSaveStatus; virDomainSaveXML; +virDomainSCSIDriveAddressIsUsed; virDomainSeclabelTypeFromString; virDomainSeclabelTypeToString; virDomainShmemDefEquals; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 23 18:26:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1554993342; cv=none; d=zoho.com; s=zohoarc; b=Zd/p56jDmAWrsMihtMf3K6YaOXfuI/Qx2X/BXm0EudH8XL9aDVa0x7NzVcRQjM1V1vp/rIH8y2cvCAZZl+TyorrpjXcTSA/CnMtdq8UINLedcz6P70sBX6cvoK8imFcaIyXv7rFfTDc12JOilIDYdLpoWdeo53QQbyBYV3/8bKc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554993342; 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:ARC-Authentication-Results; bh=NGQv5QGx9HoDZxmFKBKmvxVWM8VH5QSMmMKNRyE/gdc=; b=I4k7eogFX03VoTCqEKjvtCv4A5jTraIPFvDG1snwqT3wEE/ctChpPian12mQOWuAL36Fjoe8FrrJ7NJ46FQoZfAF6vo6infHc1n31FJxhBaiqpHJhgXJDEFaQD/oaowWYcuwjor7zb/iXOfkd4nriCPrDh8bfFZFbShhFZ56vgc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1554993342183484.1165683627346; Thu, 11 Apr 2019 07:35:42 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3A6B27F3E2; Thu, 11 Apr 2019 14:35:40 +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 0708B5D71F; Thu, 11 Apr 2019 14:35:40 +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 A421E3FB10; Thu, 11 Apr 2019 14:35:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3BEZ9fk006406 for ; Thu, 11 Apr 2019 10:35:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 562E71001DEA; Thu, 11 Apr 2019 14:35:09 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id AAFEE1001943; Thu, 11 Apr 2019 14:35:08 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Thu, 11 Apr 2019 16:34:58 +0200 Message-Id: <732a965f16ecaa7d4075a5289b00e5ccd298db48.1554993076.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: danielhb413@gmail.com Subject: [libvirt] [PATCH 2/4] qemuhotplugtest: Don't plug a SCSI disk at unit 7 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 11 Apr 2019 14:35:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Unit number 7 is kind of special. It's reserved for SCSI controller. The comment in virDomainSCSIDriveAddressIsUsed() summarizes that pretty nicely. Libvirt would never generate such address. Signed-off-by: Michal Privoznik Reviewed-by: Jim Fehlig Tested-by: Daniel Henrique Barboza --- tests/qemuhotplugtest.c | 2 +- tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml | 2 +- ...uhotplug-base-without-scsi-controller-live+disk-scsi-2.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 3eb97d886a..fbf488c54c 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -715,7 +715,7 @@ mymain(void) "device_del", QMP_OK, "human-monitor-command", HMP("")); DO_TEST_DETACH("base-with-scsi-controller-live", "disk-scsi-2", false,= false, - "device_del", QMP_DEVICE_DELETED("scsi3-0-5-7") QMP_OK, + "device_del", QMP_DEVICE_DELETED("scsi3-0-5-6") QMP_OK, "human-monitor-command", HMP("")); =20 DO_TEST_ATTACH("base-live", "qemu-agent", false, true, diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml b/tes= ts/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml index 3a847fbda6..876afb182f 100644 --- a/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml +++ b/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml @@ -2,7 +2,7 @@ -
+
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-con= troller-live+disk-scsi-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-bas= e-without-scsi-controller-live+disk-scsi-2.xml index d35fea6f5f..72b5174825 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller= -live+disk-scsi-2.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller= -live+disk-scsi-2.xml @@ -26,8 +26,8 @@ - -
+ +
--=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 23 18:26:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1554993328; cv=none; d=zoho.com; s=zohoarc; b=TAMw/37s8zwyi12qwGeGp8M+w8mFDjssadfVJJbClMd64FTIgvbwTI59bCDMv1W5q9p4gXpHNO4SvWAKw9WfkTBUykR1epF9toM8DLTcYE4zWFXnmH62eVBqqCsXtzbHb4tQThU1drVhjG+9LiZw47NKxFTguqr/t6jQ96gGVao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554993328; 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:ARC-Authentication-Results; bh=EnCizgkgy9KssgK1B4QqaxeUcPgg4zzdEGRP45ZwpqY=; b=d8Y/eiVKL5QGIwFsRc9zERQuWPBt5Yn8IhnD5LocTMTWm/GDgzhl8UEqVVlwbJFCYPOhr6mXi9quqTg1uIO0SbTxqb9vaSkxyXLp6G+QXk5MseSFKFU5ai/twk6wu5vGfrAu5WfDKqHKd8aPx2yDxb+BDXXnfvMYTNZkgCKjNsc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1554993328083430.7678475493261; Thu, 11 Apr 2019 07:35:28 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 34911307B48C; Thu, 11 Apr 2019 14:35:19 +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 3AA5918101; Thu, 11 Apr 2019 14:35:16 +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 CFC943FB11; Thu, 11 Apr 2019 14:35:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3BEZAKd006411 for ; Thu, 11 Apr 2019 10:35:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4E64E1001DEA; Thu, 11 Apr 2019 14:35:10 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3AE21001943; Thu, 11 Apr 2019 14:35:09 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Thu, 11 Apr 2019 16:34:59 +0200 Message-Id: <7ca34023934f0f7cce2e3de6a26be8c2013b10ec.1554993076.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: danielhb413@gmail.com Subject: [libvirt] [PATCH 3/4] qemu_hotplug: Check for duplicate drive addresses 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 11 Apr 2019 14:35:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" This tries to fix the same problem as f1d65853000 but it's doing so in a less invasive way. Signed-off-by: Michal Privoznik Reviewed-by: Jim Fehlig Tested-by: Daniel Henrique Barboza --- src/qemu/qemu_hotplug.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index ef14b1977c..5b6afe5c2b 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1183,6 +1183,12 @@ qemuDomainAttachSCSIDisk(virQEMUDriverPtr driver, return -1; } =20 + if (virDomainSCSIDriveAddressIsUsed(vm->def, &disk->info.addr.drive)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Domain already contains a disk with that address= ")); + return -1; + } + /* Let's make sure the disk has a controller defined and loaded before * trying to add it. The controller used by the disk must exist before= a * qemu command line string is generated. --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 23 18:26:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1554993341; cv=none; d=zoho.com; s=zohoarc; b=Y8alDKtVHd/GRUsgXP7HtkLOstaEh/VogxzeMtDZmsgBzoQ7mmfeLVG+i0T3aws+jwonL+R+NnmC/QtyeY1NnJXdcos4Rwlxc7U2M6lM21GrJ+B9c8r/EYe+3a3yFN3SxDD9sw+e73hhpE0YoW13vpBKWXKyRmgcCWpMAjusyhE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554993341; 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:ARC-Authentication-Results; bh=1X/aEKZUjjDTQnZfXNNU+itGHDgzd0/vhbKQ8SLRAF4=; b=AE0bhl4lQzvg6qSPBCaHuRJRFKOVdgzlT7hD99qe1x28VCLLDp8Y6I1B+p+ZEtFclO/rUcxMa1Emgjb0DMIFyCnRf0S3AGqaUBKy3RZLekImNQX4zHXs6RbZQou6TX0iskfXf2oKIQGjrpPDrSV7iMmBiN5KC/6Z0m/Ei1lOrB8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1554993341521157.39772539987348; Thu, 11 Apr 2019 07:35:41 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id C2129C023B; Thu, 11 Apr 2019 14:35:39 +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 08A8217BB6; Thu, 11 Apr 2019 14:35:39 +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 C0E03181AC46; Thu, 11 Apr 2019 14:35:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3BEZBZF006428 for ; Thu, 11 Apr 2019 10:35:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4912B1001DEA; Thu, 11 Apr 2019 14:35:11 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E16D1001943; Thu, 11 Apr 2019 14:35:10 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Thu, 11 Apr 2019 16:35:00 +0200 Message-Id: <1eb4268e9191f03fdfcd9b569bbb1fcffedfa070.1554993076.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: danielhb413@gmail.com Subject: [libvirt] [PATCH 4/4] Revert "domain_conf: check device address before attach" 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 11 Apr 2019 14:35:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" This reverts commit f1d6585300001c7b23b8796a0faa4411c3531996. Turns out, this caused a regression. There is this (perhaps less known) semantic of virDomainAttachDevice() where if the device the API is trying to attach is a CDROM/floppy that is already in the domain the attach request is handled as 'change the media in the drive'. We have a better fix anyways. Signed-off-by: Michal Privoznik Reviewed-by: Jim Fehlig Tested-by: Daniel Henrique Barboza --- src/conf/domain_conf.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bce4e65e0d..14d3f4d67e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -28586,15 +28586,6 @@ virDomainDefCompatibleDevice(virDomainDefPtr def, if (oldDev) data.oldInfo =3D virDomainDeviceGetInfo(oldDev); =20 - if (action =3D=3D VIR_DOMAIN_DEVICE_ACTION_ATTACH && - data.newInfo && - data.newInfo->type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && - virDomainDefHasDeviceAddress(def, data.newInfo)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("Domain already contains a device with the same a= ddress")); - return -1; - } - if (action =3D=3D VIR_DOMAIN_DEVICE_ACTION_UPDATE && live && (data.newInfo && data.oldInfo && --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list