From nobody Fri Apr 26 11:13:21 2024 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=1617184293; cv=none; d=zohomail.com; s=zohoarc; b=gcx3R/srWsvqR8IK1r5cnZ9PlN/6+WgRZ4x7yuB/obDNlVoo57xoO8z3IV99RYx9BCuYGPzAfe9ViqtyhgQsgPQ+b3xN0sbKCChMvJm9FUSTjv2fWgJnNCp8EyTrlB/ckyfJD2GNqVdC/zirjtx0VzgjG35INOaQLEqbag2hxmk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617184293; 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=teLn4oIDWuVk+6ooEr/0PuoaqbsARUTt2jK8960iRxE=; b=Hp9AqbRhi3B5R57w1uS1fe/ltViCPmWFTmclspWr/ahGy3xg0RXHxjJE1zHfHaNO52ppOfeCclYIqr8OPeFfoVnA31SN2x529UzjLNskIp3qOQ6MexOqMkwq3oBHZo4oNUKal1GndnuE8zd7EW8yuPbsCIPBCWg7IX+gdiZUxiw= 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 1617184293007694.5270397328752; Wed, 31 Mar 2021 02:51:33 -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-261-8YI-IX9lOxyPfvs0aWkBuQ-1; Wed, 31 Mar 2021 05:51:29 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 10DD3801FD8; Wed, 31 Mar 2021 09:51:23 +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 E3C152C31A; Wed, 31 Mar 2021 09:51:22 +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 9E7FF4BB7C; Wed, 31 Mar 2021 09:51:22 +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 12V9oXXX006841 for ; Wed, 31 Mar 2021 05:50:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 985A04F3C6; Wed, 31 Mar 2021 09:50:33 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-114-96.ams2.redhat.com [10.36.114.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id B6F3C6E71D; Wed, 31 Mar 2021 09:50:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617184292; 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=teLn4oIDWuVk+6ooEr/0PuoaqbsARUTt2jK8960iRxE=; b=ABHO+GVFdBjuWgnCnRW5YI/SKm1rhwJRT0F3YiZA2s6elLfTfjfa8RENf5JL309d0xPvNq +r4ap/4X36HIVyVQrzsdVFDBTnMXnmaR2mC1Wz4Cr6Sy0vi05aN4oo5Uuuc+CdSGsS5X7d 5qE/TJo27zrqPNh7mZ2yOyQUfUN/NMc= X-MC-Unique: 8YI-IX9lOxyPfvs0aWkBuQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/2] conf: add support for disk "rotation_rate" property Date: Wed, 31 Mar 2021 10:50:25 +0100 Message-Id: <20210331095026.228215-2-berrange@redhat.com> In-Reply-To: <20210331095026.228215-1-berrange@redhat.com> References: <20210331095026.228215-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.15 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) This lets the app expose the virtual SCSI or IDE disks as solid state devices by setting a rate of '1', or rotational media by setting a rate between 1025 and 65534. Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/formatdomain.rst | 13 ++++++++++--- docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 11 +++++++++++ src/conf/domain_conf.h | 1 + 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 741130bf21..224f44a0a2 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -2372,7 +2372,7 @@ paravirtualized driver is specified via the ``disk`` = element. - + @@ -2385,7 +2385,7 @@ paravirtualized driver is specified via the ``disk`` = element. - +
@@ -2885,10 +2885,17 @@ paravirtualized driver is specified via the ``disk`= ` element. to "closed". NB, the value of ``tray`` could be updated while the domai= n is running. The optional attribute ``removable`` sets the removable flag f= or USB disks, and its value can be either "on" or "off", defaulting to "off". + The optional attribute ``rotation_rate`` sets the rotation rate of the + storage for disks on a SCSI, IDE, or SATA bus. Values in the range 1025= to + 65534 are used to indicate rotational media spee in revolutions per min= ute. + A value of one is used to indicate solid state, or otherwise non-rotati= onal, + storage. These values are not required to match the values of the under= lying + host storage. :since:`Since 0.0.3`; ``bus`` attribute :since:`since 0.4.3`; ``tray`` attribute :since:`since 0.9.11`; "usb" attribute value :since:`since after 0.4.4`; "sata" attribute value :since:`since 0.9.7`; - "removable" attribute value :since:`since 1.1.3` + "removable" attribute value :since:`since 1.1.3`; + "rotation_rate" attribute value :since:`since 7.3.0` ``iotune`` The optional ``iotune`` element provides the ability to provide additio= nal per-device I/O tuning, with values that can vary for each device (contr= ast diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f5ced5b7a2..2ff7862539 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2230,6 +2230,11 @@ + + + + + diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d050a519c6..1e72171586 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9319,6 +9319,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, g_autofree char *vendor =3D NULL; g_autofree char *product =3D NULL; g_autofree char *domain_name =3D NULL; + g_autofree char *rotation_rate =3D NULL; =20 if (!(def =3D virDomainDiskDefNew(xmlopt))) return NULL; @@ -9383,6 +9384,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, bus =3D virXMLPropString(cur, "bus"); tray =3D virXMLPropString(cur, "tray"); removable =3D virXMLPropString(cur, "removable"); + rotation_rate =3D virXMLPropString(cur, "rotation_rate"); =20 /* HACK: Work around for compat with Xen * driver in previous libvirt releases */ @@ -9615,6 +9617,13 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlop= t, } } =20 + if (rotation_rate && + virStrToLong_ui(rotation_rate, NULL, 10, &def->rotation_rate) < 0)= { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cannot parse rotation rate '%s'"), rotation_rate= ); + return NULL; + } + if (virDomainDeviceInfoParseXML(xmlopt, node, ctxt, &def->info, flags | VIR_DOMAIN_DEF_PARSE_ALLOW_BOO= T) < 0) { return NULL; @@ -25141,6 +25150,8 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " removable=3D'%s'", virTristateSwitchTypeToString(def->removable)); } + if (def->rotation_rate) + virBufferAsprintf(buf, " rotation_rate=3D'%u'", def->rotation_rate= ); virBufferAddLit(buf, "/>\n"); =20 virDomainDiskDefFormatIotune(buf, def); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0b8895bbdf..3da9ba01bf 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -539,6 +539,7 @@ struct _virDomainDiskDef { char *dst; int tray_status; /* enum virDomainDiskTray */ int removable; /* enum virTristateSwitch */ + unsigned int rotation_rate; =20 virStorageSourcePtr mirror; int mirrorState; /* enum virDomainDiskMirrorState */ --=20 2.30.2 From nobody Fri Apr 26 11:13:21 2024 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=1617184247; cv=none; d=zohomail.com; s=zohoarc; b=Z5mZC8dYx+hoAlOh7AmbjzYeWcRaz+4XVE+l4sqMRzvVDp39pEdUVXRlZWSejIPo2mU9Zje+M8x/czpnY7Kyg/vMaDhgc8RW2AngT+MMhP9D/hOox2XfTY0b826qN5aR4q+SBa405KqRAc3BYQcbCe/M9jj4xFaQZRDLTclfdVc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617184247; 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=Gsoxu5zb3R2kV7vqgKZTqXF9d5aOtTdlYjmuHChK+kI=; b=YM/c+PRrbm/Y3BjoxL0rwvrGA7eiEuUTHofR3vOorE1+qZJJVEvOQW4xg+Fz1u9wB6sRzJ6bNy25tqDQLkxq+j3uVbSU0eSVhGwh1PwvoKP+EKSTG5w2mpuL3Ib2oqd4PqPa6Rr76MbguRXVeuTrV61eOH+5IqXeMZHikmN2S2I= 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 1617184247753703.4034896624896; Wed, 31 Mar 2021 02:50:47 -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-435-3-ZXUEjEP86kqXoztS1EgQ-1; Wed, 31 Mar 2021 05:50:43 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5D96750203; Wed, 31 Mar 2021 09:50:37 +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 0599D6E70D; Wed, 31 Mar 2021 09:50:37 +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 78E584A7CB; Wed, 31 Mar 2021 09:50:36 +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 12V9oYhG006856 for ; Wed, 31 Mar 2021 05:50:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id DB8906BC2D; Wed, 31 Mar 2021 09:50:34 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-114-96.ams2.redhat.com [10.36.114.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC2C4179E6; Wed, 31 Mar 2021 09:50:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617184246; 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=Gsoxu5zb3R2kV7vqgKZTqXF9d5aOtTdlYjmuHChK+kI=; b=TSjOkk5OHOj6C5JdrXXqAdZ3O3PLGg3OqvSPpEjKbFO9KY9Vxv+p55h9o06b2aFl+djdFF DFHm7BAqp56XtQKM3V3FWLdX3ijZaq+RYGFgXYVYeZYR1QXhMN8bHIHyT2QSP1fKHgbiyL L5tXMJso692TUnetjbPJd2wSGr7nd7E= X-MC-Unique: 3-ZXUEjEP86kqXoztS1EgQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/2] qemu: implement setting of rotation rate for SCSI/IDE disks Date: Wed, 31 Mar 2021 10:50:26 +0100 Message-Id: <20210331095026.228215-3-berrange@redhat.com> In-Reply-To: <20210331095026.228215-1-berrange@redhat.com> References: <20210331095026.228215-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.11 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Han Han Reviewed-by: J=C3=A1n Tomko Tested-by: Han Han --- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 3 + src/qemu/qemu_validate.c | 22 ++++++++ .../caps_2.12.0.aarch64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + .../caps_5.2.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../disk-rotation.x86_64-latest.args | 56 +++++++++++++++++++ tests/qemuxml2argvdata/disk-rotation.xml | 38 +++++++++++++ tests/qemuxml2argvtest.c | 1 + .../disk-rotation.x86_64-latest.xml | 55 ++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 33 files changed, 203 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-rotation.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-rotation.xml create mode 100644 tests/qemuxml2xmloutdata/disk-rotation.x86_64-latest.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index deedff2e9f..ea24e2d6a5 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -624,6 +624,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "audiodev", "blockdev-backup", "object.qapified", + "rotation-rate", ); =20 =20 @@ -1440,6 +1441,7 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps= DevicePropsSCSIDisk[] =3D { { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, { "device_id", QEMU_CAPS_SCSI_DISK_DEVICE_ID, NULL }, { "werror", QEMU_CAPS_STORAGE_WERROR, NULL }, + { "rotation_rate", QEMU_CAPS_ROTATION_RATE, NULL }, }; =20 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIDEDrive[]= =3D { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index da51a788fa..a70c00a265 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -604,6 +604,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_AUDIODEV, /* -audiodev instead of QEMU_AUDIO_DRV */ QEMU_CAPS_BLOCKDEV_BACKUP, /* qemu supports the blockdev-backup job */ QEMU_CAPS_OBJECT_QAPIFIED, /* parameters for object-add are formally d= escribed */ + QEMU_CAPS_ROTATION_RATE, /* scsi-disk / ide-drive rotation-rate prop */ =20 QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1b4fa77867..7fcf7ad1ef 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1863,6 +1863,9 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virBufferAsprintf(&opt, ",wwn=3D0x%s", disk->wwn); } =20 + if (disk->rotation_rate) + virBufferAsprintf(&opt, ",rotation_rate=3D%u", disk->rotation_rate= ); + if (disk->vendor) { virBufferAddLit(&opt, ",vendor=3D"); virQEMUBuildBufferEscapeComma(&opt, disk->vendor); diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 6043f974ce..09778085a8 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2547,6 +2547,28 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDom= ainDiskDef *disk, } } =20 + if (disk->rotation_rate) { + if (disk->bus !=3D VIR_DOMAIN_DISK_BUS_SCSI && + disk->bus !=3D VIR_DOMAIN_DISK_BUS_IDE && + disk->bus !=3D VIR_DOMAIN_DISK_BUS_SATA) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("rotation rate is only valid for SCSI/IDE/SAT= A bus")); + return -1; + } + + if (disk->device !=3D VIR_DOMAIN_DISK_DEVICE_DISK) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("rotation rate is only valid for disk device"= )); + return -1; + } + + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_ROTATION_RATE)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("rotation rate is not supported with this QEM= U")); + return -1; + } + } + switch (disk->bus) { case VIR_DOMAIN_DISK_BUS_SCSI: diskInfo =3D (virDomainDeviceInfoPtr)&disk->info; diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.12.0.aarch64.xml index 93c768c633..f9d85560b6 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -169,6 +169,7 @@ + 2012000 0 61700289 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.aarch64.xml index 915c84f66e..8f8d09eda0 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -184,6 +184,7 @@ + 4000000 0 61700240 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.0.0.ppc64.xml index b096120ae3..3c32aceaf9 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -192,6 +192,7 @@ + 4000000 0 42900240 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.riscv32.xml index 53c35beba6..3741f75aff 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -184,6 +184,7 @@ + 4000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.riscv64.xml index d76ad4102b..c2ee65a232 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -184,6 +184,7 @@ + 4000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.0.0.s390x.xml index e61a9570b7..3b25aabf93 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -148,6 +148,7 @@ + 4000000 0 39100240 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.0.0.x86_64.xml index 17395394df..5c2511eaa7 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -229,6 +229,7 @@ + 4000000 0 43100240 diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.1.0.x86_64.xml index 6bc2fea7b4..49d5fc5578 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -236,6 +236,7 @@ + 4001000 0 43100241 diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index 371e6192e2..eeeb27797b 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -199,6 +199,7 @@ + 4001050 0 61700242 diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index 83f914cabe..d18776778d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -199,6 +199,7 @@ + 4001050 0 42900242 diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 1f6f2e5833..67c6f9248c 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -161,6 +161,7 @@ + 4002000 0 39100242 diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index 8f9972eb14..28f6666f7f 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -247,6 +247,7 @@ + 4002000 0 43100242 diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index 51d83b9f47..68ccaf6219 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -209,6 +209,7 @@ + 5000000 0 61700241 diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index 4e6aec6fda..3dd4139263 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -218,6 +218,7 @@ + 5000000 0 42900241 diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index 850dda922b..5993348d6b 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -204,6 +204,7 @@ + 5000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index 7dd3e9ae89..9467e4cfeb 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -254,6 +254,7 @@ + 5000000 0 43100241 diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemuca= pabilitiesdata/caps_5.1.0.sparc.xml index 5b4b9d4b5b..a4838def4d 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -119,6 +119,7 @@ + 5001000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index 71ae857c8f..12bb9a1b0f 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -256,6 +256,7 @@ + 5001000 0 43100242 diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.aarch64.xml index 4417f03f13..d88f7c989a 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -213,6 +213,7 @@ + 5002000 0 61700243 diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index f5d072b6c6..673d8b38ad 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -220,6 +220,7 @@ + 5002000 0 42900243 diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index c12477a55c..da2320fd69 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -206,6 +206,7 @@ + 5002000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index 53ed7fa312..a54b9bb096 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -168,6 +168,7 @@ + 5002000 0 39100243 diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index 1f6b2de2a1..2fee135b1e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -257,6 +257,7 @@ + 5002000 0 43100243 diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index 555b6b5317..f260c60d5a 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -260,6 +260,7 @@ + 5002050 0 43100242 diff --git a/tests/qemuxml2argvdata/disk-rotation.x86_64-latest.args b/test= s/qemuxml2argvdata/disk-rotation.x86_64-latest.args new file mode 100644 index 0000000000..1ee96424e1 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-rotation.x86_64-latest.args @@ -0,0 +1,56 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 8,sockets=3D8,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 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +"node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ",\ +"file":"libvirt-3-storage"}' \ +-device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\ +device_id=3Ddrive-scsi0-0-0-0,drive=3Dlibvirt-3-format,id=3Dscsi0-0-0-0,bo= otindex=3D1,\ +rotation_rate=3D7200 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2",\ +"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 scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D1,\ +device_id=3Ddrive-scsi0-0-0-1,drive=3Dlibvirt-2-format,id=3Dscsi0-0-0-1,\ +rotation_rate=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3",\ +"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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,\ +rotation_rate=3D4500 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-rotation.xml b/tests/qemuxml2argvd= ata/disk-rotation.xml new file mode 100644 index 0000000000..0a810e54cc --- /dev/null +++ b/tests/qemuxml2argvdata/disk-rotation.xml @@ -0,0 +1,38 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 8 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-i386 + + + +
+ + + + +
+ + + + + + + + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3439f34ef1..ea98f0e6a8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1469,6 +1469,7 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-backing-chains-noindex"); =20 DO_TEST_CAPS_LATEST("disk-slices"); + DO_TEST_CAPS_LATEST("disk-rotation"); =20 DO_TEST_CAPS_ARCH_VER("disk-arm-virtio-sd", "aarch64", "4.0.0"); DO_TEST_CAPS_ARCH_LATEST("disk-arm-virtio-sd", "aarch64"); diff --git a/tests/qemuxml2xmloutdata/disk-rotation.x86_64-latest.xml b/tes= ts/qemuxml2xmloutdata/disk-rotation.x86_64-latest.xml new file mode 100644 index 0000000000..2b639c87f9 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-rotation.x86_64-latest.xml @@ -0,0 +1,55 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 8 + + hvm + + + + qemu64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-i386 + + + + +
+ + + + + +
+ + + + + +
+ + +
+ + +
+ + + +
+ + + +