From nobody Fri Apr 19 12:39:01 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; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1554932976; cv=none; d=zoho.com; s=zohoarc; b=ny3Bm2To7xl0Xc3fDSF0GZ9NfTM1R/6u7rtoTvB3laY9ip0Yb5OdEcW+f/QEmSZA1t0x7dzws5mQquCaFapzLGQ9FcPzEeLn4PU4vv1pCIhWRZ5uDPdK0fdg64gRMxESE6pQbMUMcRcny/EviwmdqyGbgXxILneAJ3IOL+gclVw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554932976; 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=SX8/NdMW+oi4WoGDHHdU7qWnOSE/XdpQ/ZgzJBZcGl8=; b=BSZaOzoDxEsoCjj/cNbmRob4mnPiwsHwYDZgKQYbjeq8HeJxDV9oJXaNWqBZP/gjZXkUYlC/F+d88rLHwzeZCavLhiZRp6oXwNiihtNFdCWwimt5WMoB1vNDnVm2TtBJ+DMSJihGn8VInHOasYQyNdRNafMRUVJ6moxAmTzKNF8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail 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 1554932976209114.04585466365711; Wed, 10 Apr 2019 14:49:36 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5A8F3306545A; Wed, 10 Apr 2019 21:49: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 2178312A6A; Wed, 10 Apr 2019 21:49: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 C4B0F181AC47; Wed, 10 Apr 2019 21:49:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3ALnRJu006629 for ; Wed, 10 Apr 2019 17:49:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id F0A6417F21; Wed, 10 Apr 2019 21:49:27 +0000 (UTC) Received: from mx1.redhat.com (ext-mx09.extmail.prod.ext.phx2.redhat.com [10.5.110.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EAAEA608A7; Wed, 10 Apr 2019 21:49:24 +0000 (UTC) Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5B085FD3C2; Wed, 10 Apr 2019 21:49:23 +0000 (UTC) Received: by mail-qk1-f196.google.com with SMTP id c1so2241853qkk.4; Wed, 10 Apr 2019 14:49:23 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:f701:d7d6:9e6a:ca5e:8a85:57a7]) by smtp.gmail.com with ESMTPSA id r15sm25216716qtb.22.2019.04.10.14.49.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Apr 2019 14:49:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yIXE7yJhQ6YW8FRbzz3lx1KssQGcbz/sNRX3lUAxlMY=; b=pItxL6SCGIYWmPe6ipGse/bOZpNE3IQf5FHcKoqqIKXeIe571HQxrgFtJ6NqwOX1yP 6ygWEG4mkanG48C18tSmN70wISDNmuSBarbdz1cAtkVoTHqE7NrRPiSC+hAYwT0+l33n pd4DwELWDbMZHg71s5jA+2tw4jG2kud6s3XdkKqc0F0Dk83GVDS6b+P0O14TAX1mEWcM 2cayFH7xbwWknwUZhtV+jZs+OqlK0b+fWi8wynzYgr/s+f6rcX8yERBBEZ/7DGivXEzr MaxGt4EBiVGM4on9wvyvKzhvGxa3M5sgYThdQrAbkKzcttCpieYTiXdotOtiSBGD9ghT s9yQ== 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=yIXE7yJhQ6YW8FRbzz3lx1KssQGcbz/sNRX3lUAxlMY=; b=dH0/9DjZ0ggiF0RFdoOE3SKPHZeDhpU08u5Hk6eD5pIY8tABKvfezCyA2RSKLGbDxr R2Pm5MIzR94GL5T2MCqXbBSNqnYI7bgmW/MKGIIsrUCk49zOXVx/nc7VygXaCg8/p5B3 Ke9UGGfmOtvui6Erblup4CT6hVS+knDS4ojSK5JttNjPqdeTBWx/pWBUs0AiwQeQSfDb i0b8Q3/8JYud5VOWZE76CHCKOxdy5hhcd2Kdhnig1sSnjXLWIHHcnPWDOd+mNcfYA7N2 4HCLuJg3QxNZwN+xmIx3vr0WVmOfgG27clt9qY18DTzLgjXQlzE1dseWGd6m3RvUVNrK bDqw== X-Gm-Message-State: APjAAAXoz4vezo6EyOigy/VUQtkb/Q3aL1EIF1XOSCZJyNSGZTN2A0Xz +8OhxSluVavggRrJ1RkXQvI0ZDBg X-Google-Smtp-Source: APXvYqzVis74kxRp808DdxBuhk4UVDPXA6eaLOp6H4uvGfv39Rxfi61D93QRnhJsSPpyfLHNGBzHZw== X-Received: by 2002:a05:620a:16d1:: with SMTP id a17mr35702436qkn.92.1554932962519; Wed, 10 Apr 2019 14:49:22 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Wed, 10 Apr 2019 18:49:06 -0300 Message-Id: <20190410214907.27170-2-danielhb413@gmail.com> In-Reply-To: <20190410214907.27170-1-danielhb413@gmail.com> References: <20190410214907.27170-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 10 Apr 2019 21:49:23 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 10 Apr 2019 21:49:23 +0000 (UTC) for IP:'209.85.222.196' DOMAIN:'mail-qk1-f196.google.com' HELO:'mail-qk1-f196.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.117 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_PASS) 209.85.222.196 mail-qk1-f196.google.com 209.85.222.196 mail-qk1-f196.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.38 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com, Daniel Henrique Barboza Subject: [libvirt] [PATCH 1/2] domain_conf: adding virDomainDiskIsCdromOrFloppy helper 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Wed, 10 Apr 2019 21:49:34 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Checking if a device is a CDROM or floppy disk is a common verification that is made a few times in the code, and next patch is going to add one more. Let's put it into a helper to enhance readability and spare some lines of code. Signed-off-by: Daniel Henrique Barboza --- src/conf/domain_conf.c | 8 ++++++++ src/conf/domain_conf.h | 2 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 3 +-- src/qemu/qemu_driver.c | 3 +-- src/qemu/qemu_hotplug.c | 6 ++---- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bbde3788a6..b6be1e730d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16708,6 +16708,14 @@ void virDomainDiskInsertPreAlloced(virDomainDefPtr= def, } =20 =20 +bool +virDomainDiskIsCdromOrFloppy(virDomainDiskDefPtr disk) +{ + return disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM || + disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_FLOPPY; +} + + virDomainDiskDefPtr virDomainDiskRemove(virDomainDefPtr def, size_t i) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 12eb71c197..2a1c6fd18b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3579,4 +3579,6 @@ virDomainGraphicsGetRenderNode(const virDomainGraphic= sDef *graphics); bool virDomainGraphicsNeedsAutoRenderNode(const virDomainGraphicsDef *graphics); =20 +bool +virDomainDiskIsCdromOrFloppy(virDomainDiskDefPtr disk); #endif /* LIBVIRT_DOMAIN_CONF_H */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 6e64e77839..817d9bc28d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -342,6 +342,7 @@ virDomainDiskInsert; virDomainDiskInsertPreAlloced; virDomainDiskIoTypeFromString; virDomainDiskIoTypeToString; +virDomainDiskIsCdromOrFloppy; virDomainDiskMirrorStateTypeFromString; virDomainDiskMirrorStateTypeToString; virDomainDiskModelTypeFromString; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a3e845a848..2c663c9009 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1666,8 +1666,7 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk, =20 /* nothing to format if the drive is empty */ if (!(source || srcprops) || - ((disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_FLOPPY || - disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM) && + (virDomainDiskIsCdromOrFloppy(disk) && disk->tray_status =3D=3D VIR_DOMAIN_DISK_TRAY_OPEN)) { ret =3D 0; goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fe2c586274..599c0f175f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8021,8 +8021,7 @@ qemuDomainChangeDiskLive(virDomainObjPtr vm, =20 if (!virStorageSourceIsSameLocation(disk->src, orig_disk->src)) { /* Disk source can be changed only for removable devices */ - if (disk->device !=3D VIR_DOMAIN_DISK_DEVICE_CDROM && - disk->device !=3D VIR_DOMAIN_DISK_DEVICE_FLOPPY) { + if (!virDomainDiskIsCdromOrFloppy(disk)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("disk source can be changed only in removable= " "drives")); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index ef14b1977c..0ba1cc48c9 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1230,8 +1230,7 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriverP= tr driver, virDomainDiskDefPtr disk =3D dev->data.disk; int ret =3D -1; =20 - if (disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM || - disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_FLOPPY) { + if (virDomainDiskIsCdromOrFloppy(disk)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cdrom/floppy device hotplug isn't supported")); return -1; @@ -1314,8 +1313,7 @@ qemuDomainAttachDeviceDiskLive(virQEMUDriverPtr drive= r, =20 /* this API overloads media change semantics on disk hotplug * for devices supporting media changes */ - if ((disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM || - disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_FLOPPY) && + if (virDomainDiskIsCdromOrFloppy(disk) && (orig_disk =3D virDomainDiskFindByBusAndDst(vm->def, disk->bus, di= sk->dst))) { if (qemuDomainChangeEjectableMedia(driver, vm, orig_disk, disk->src, false) < 0) --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 19 12:39:01 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; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1554932973; cv=none; d=zoho.com; s=zohoarc; b=gCM4BKWvYq5lJbJ6IOx2III88tQXjQaGf1iOXnJcTuvFFG5XTxPyvyoBwNsEwQpI7Ef0T96IlV9EV0++IS8yBg5luWDNmgrDIiOY2D5hvK286/hs8PuXeU3UdVOAw63O2Zl1C4Zbt4JxjgolB0l1sBMr6iAALE0F4mXU4BmXjKY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554932973; 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=7MdmnfbHvI7AsTiRF4iGQH7iJ1CcNEoa4Lt+KznRn9g=; b=AAwBczBSOZiCLtpKhHuPIFhg541O4ApzxYXq9aksfykNA91i3IfjEmRzCTEpCf994EfZe3frS6XNchJZKrckf9yKjNrYtkvjet9i7RQF9IewCheCVu4EX8y8FmOZvxbNbFtemAy2umBXNormANNyqy1XYbEuOwx0co1XfE8m4Zg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail 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 1554932973836354.9441107796548; Wed, 10 Apr 2019 14:49:33 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 09D1F1F566; Wed, 10 Apr 2019 21:49:32 +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 D8A3D608A7; Wed, 10 Apr 2019 21:49:31 +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 9A3EF41F3C; Wed, 10 Apr 2019 21:49:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3ALnT77006639 for ; Wed, 10 Apr 2019 17:49:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4007A64426; Wed, 10 Apr 2019 21:49:29 +0000 (UTC) Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2CFBB6013A; Wed, 10 Apr 2019 21:49:25 +0000 (UTC) Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E9ACBC0AC900; Wed, 10 Apr 2019 21:49:24 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id s15so4805808qtn.3; Wed, 10 Apr 2019 14:49:24 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:f701:d7d6:9e6a:ca5e:8a85:57a7]) by smtp.gmail.com with ESMTPSA id r15sm25216716qtb.22.2019.04.10.14.49.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Apr 2019 14:49:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NPrP8+w589GRi+8GFmKHvxEoqGLKeZeFs+BSi+nTNNg=; b=Y+/AcdY47eW2HlzOrHZT7SNI6zCf5sUPZT/mzH1CLW4gyQfi8VFXysWe3FPfcSr/yd 6wHdnMlYHtP63T2zUiw30sE8SC14VYWD6ZkqqmiY/k1ImRvNHP/059dNLZPmNIkkx9bH rf5+bP3z8qOAT3JEx4INk9rwH1NI74CHLuDyFdrCJuc7JK6Ft84f/P9KV4xh7GfKsJN6 zn39S3HI3eEhyI4pHa51fUXq6TQARSs1KOMIj46I4dy/dJpp5nQAgHfsGevAVBknIbbo HQH2gnMJ9fBhfAxVxDyqLpvl8eEe07bFhGS13LBChcHkLbHiTgyJoDgsIOnTKcbqNufL kgmA== 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=NPrP8+w589GRi+8GFmKHvxEoqGLKeZeFs+BSi+nTNNg=; b=UGA2hmUQQMqFZtiLalxpOsb9JfW7wuv6NXvzPanzZYYLO5vtTXDXDfAyi50t69+gLg dpcVtGn+lLehjFSRTnylQxySVpAiUbPTv0s0xM3/W2bFTSvdtctwEGcfxVj/Anhcimv+ roWxEMa5Xp7NKr8NtcsXnliwsZwWlKoQ4fes3SlRc75y4L7l3wAoV0S8ZsidUN3dDtDU /fqPAue0iM+pQeDr2yyRzfFKfC5PVKUhhASEMOJGxL7YRmE4Ss2Mbh0bWTK5jKBzjAG0 Wclys4FJW0k8QGyVA6Po4PcrKuEJO+PWfiZ/6He/Lvfz/5m9FYgSTtkP0FkxLa4D3xSr Wvqg== X-Gm-Message-State: APjAAAVEMzzouj284gywB+Riec2q61Qi+pK8F2b2Vvea+fzYfz1jyWS/ FV5DZU6UhWCejnPTb9E9n3FHnCHC X-Google-Smtp-Source: APXvYqzHdc1pJ3U+sOiYIwZjZH1Et1OQQcAQTs4XuhaYQ7g3P4WJ1SM44pTi7BU3HuVpLkJf5b05eg== X-Received: by 2002:a0c:b6d1:: with SMTP id h17mr38373778qve.38.1554932964083; Wed, 10 Apr 2019 14:49:24 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Wed, 10 Apr 2019 18:49:07 -0300 Message-Id: <20190410214907.27170-3-danielhb413@gmail.com> In-Reply-To: <20190410214907.27170-1-danielhb413@gmail.com> References: <20190410214907.27170-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 10 Apr 2019 21:49:25 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 10 Apr 2019 21:49:25 +0000 (UTC) for IP:'209.85.160.193' DOMAIN:'mail-qt1-f193.google.com' HELO:'mail-qt1-f193.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.142 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 209.85.160.193 mail-qt1-f193.google.com 209.85.160.193 mail-qt1-f193.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.31 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com, Daniel Henrique Barboza Subject: [libvirt] [PATCH 2/2] domain_conf: allow CDROM/Floppy media change with attach-device 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 10 Apr 2019 21:49:32 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit f1d6585300 ("domain_conf: check device address before attach") added an address verification for all devices, avoiding calling the driver attach() for a case in which we know that the device would have duplicated address. That commit failed to contemplate the case of CDROM/Floppy devices that can change and eject media using attach-device, an usage that is also covered by this command. This patch adds an extra condition for the added address verification code, allowing CDROM/Floppy devices to bypass it. Fixes: f1d6585300001c7b23b8796a0faa4411c3531996 Reported-by: Jim Fehlig Signed-off-by: Daniel Henrique Barboza --- src/conf/domain_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b6be1e730d..f65a335d86 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -28597,6 +28597,7 @@ virDomainDefCompatibleDevice(virDomainDefPtr def, if (action =3D=3D VIR_DOMAIN_DEVICE_ACTION_ATTACH && data.newInfo && data.newInfo->type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + !virDomainDiskIsCdromOrFloppy(dev->data.disk) && virDomainDefHasDeviceAddress(def, data.newInfo)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Domain already contains a device with the same a= ddress")); --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list