From nobody Fri Apr 26 18:25:44 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; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com 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 16311585434391008.2454671748753; Wed, 8 Sep 2021 20:35: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-393-mV2eTlKfMjuLT0JyHFfODw-1; Wed, 08 Sep 2021 23:35:40 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9566610059CD; Thu, 9 Sep 2021 03:35:35 +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 68D745D9F4; Thu, 9 Sep 2021 03:35:35 +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 994E81809C84; Thu, 9 Sep 2021 03:35:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1893ZUTW003992 for ; Wed, 8 Sep 2021 23:35:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0C0942094D3B; Thu, 9 Sep 2021 03:35:30 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 05C252095BB0 for ; Thu, 9 Sep 2021 03:35:27 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0056A8934E6 for ; Thu, 9 Sep 2021 03:35:27 +0000 (UTC) Received: from corp-ob09.yahoo-corp.jp (corp-ob09.yahoo-corp.jp [182.22.125.216]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-418-RaUawBlyN82YfoyB1afqsA-1; Wed, 08 Sep 2021 23:35:24 -0400 Received: from JPN01-TY1-obe.outbound.protection.outlook.com (mail-ty1jpn01lp2053.outbound.protection.outlook.com [104.47.93.53]) by corp-ob09.yahoo-corp.jp (Postfix) with ESMTPS id 02F3E19FB185 for ; Thu, 9 Sep 2021 12:35:21 +0900 (JST) Received: from TY2PR01MB2010.jpnprd01.prod.outlook.com (2603:1096:404:10::15) by TYAPR01MB2752.jpnprd01.prod.outlook.com (2603:1096:404:82::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Thu, 9 Sep 2021 03:35:20 +0000 Received: from TY2PR01MB2010.jpnprd01.prod.outlook.com ([fe80::cce2:1d9a:207c:c06c]) by TY2PR01MB2010.jpnprd01.prod.outlook.com ([fe80::cce2:1d9a:207c:c06c%5]) with mapi id 15.20.4478.025; Thu, 9 Sep 2021 03:35:20 +0000 Received: from R-SUR-LBA-2603.yahoo.co.jp (211.14.29.147) by TYCPR01CA0024.jpnprd01.prod.outlook.com (2603:1096:405::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Thu, 9 Sep 2021 03:35:19 +0000 X-MC-Unique: mV2eTlKfMjuLT0JyHFfODw-1 X-MC-Unique: RaUawBlyN82YfoyB1afqsA-1 From: Hiroki Narukawa To: libvir-list@redhat.com Subject: [PATCH 1/5] qemu: Make disk-virtio-queues tests use DO_TEST_CAPS_LATEST Date: Thu, 9 Sep 2021 12:34:44 +0900 Message-Id: <20210909033448.7018-2-hnarukaw@yahoo-corp.jp> In-Reply-To: <20210909033448.7018-1-hnarukaw@yahoo-corp.jp> References: <20210909033448.7018-1-hnarukaw@yahoo-corp.jp> X-ClientProxiedBy: TYCPR01CA0024.jpnprd01.prod.outlook.com (2603:1096:405::36) To TY2PR01MB2010.jpnprd01.prod.outlook.com (2603:1096:404:10::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e23910ab-68fc-4b81-31f0-08d97342d949 X-MS-TrafficTypeDiagnostic: TYAPR01MB2752: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: 8igCPSkJrU7ApimgdjXKn5SwVG90RW2BJaZBZMCp1NSD5icG/bVmM8RfVtCXEN/fvWpkS+rCDY+222A653kSSI2NiFVnMbEbA7063nFC0XT0ZEyHdBc4ryilx6WWaLPReVf7sZmkI2kAuucxWN+itVZOEoUwxyU0RmlU4EEpKRUqYgThXWf0AH81ikyVzg/2wAYv1xya4H5KRJ0WuVAUhPVrUgH8k+eXzw4O9pk5fgzWiw71mS8tAQMCMXneLrRYE1FGrHWJS+E6x7TekbEUl8c686xGZeVSxolHsJjXCojba9W/y2iQd9ZH4Rx9EAYi9zywLg+9cirp3dTkKFtH9o4xJwgspnW/a3ZoHBg3pKXTuhdmhdf+LhKTqEp4/BIFNVuXQD3QmH630WlqOmTw3p2l06+WflC8xuoClhdDMOqm46Vu3Gx3H5ke+WCds6tWxnH/x6CwlpD0Pa3QR6tL7qB3bQk2Ya/neI6ltk1QSrtBL/hs71o/Zs5IZs/d6VnsoyW7wYHqDiDKxXaNAT1QQh2MFpa4qj9uMn7lXaoJTVzZHnqYPKWC2M5nICgkyk9FdgyJVLsogXG0NRCB5SIDa+rUCWIGy3++lVdIBDcrDK+SBvGhSl0xgi1khcQLALZSg7eH5FDx3cKVu7iBMzOX6JGQXr/INxikR6W20CCR/r3AuMxSspH/JVqFMqiSVRai6LV9FofFf6eIdEoy6UgiEw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TY2PR01MB2010.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(136003)(346002)(366004)(39860400002)(396003)(83380400001)(107886003)(956004)(2906002)(2616005)(186003)(66556008)(66476007)(6506007)(26005)(52116002)(86362001)(6916009)(36756003)(8936002)(6666004)(4326008)(38350700002)(38100700002)(8676002)(5660300002)(66946007)(316002)(6512007)(478600001)(6486002)(1076003); DIR:OUT; SFP:1102 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7iI7wnIiKXwi3AG2VPGqlSRQTNrS11z4fdcszNMGR2mhQVV08mSfQ1Exdlhf?= =?us-ascii?Q?khFc0kTJvzFY8vMUQHRKrsDwskwcehi+TDAvG9WCqbJDPyBcyVv3YEFbkYak?= =?us-ascii?Q?c4YLSoDVN+xqDwt0vNJteETlnDQuFNyvDJnhWsKchsIVKCtxEw2CHQpAw+Qx?= =?us-ascii?Q?KV6s0dPI7Wv/SkFNVZqd/qNHsHnx9Yzl7UbWEglF1XtJ3NNUykryfq0FL5MN?= =?us-ascii?Q?fKv/D3io6zr6r7WcA8TCWvrf/wZw3w8RS8Q4NTxC9zLAIJ/EzRO/NzZGYntY?= =?us-ascii?Q?1gFiNOYoyXXTb+iGJBIVLjykboMtuNmRhP00PCo4YeFS8YN8OWTGixgX93Ov?= =?us-ascii?Q?8Y5bl8xZ2MgOjIDBcEUpJV8lyp7d80vkY8N8JxF2d8m0LRwtUnxWUx/CknYg?= =?us-ascii?Q?JN72SRkx4wOsPQaagOk04SzdkH4z0bD7M6/PQ3ook1ujfZ48Id/41EWdgaTy?= =?us-ascii?Q?+wEmlZYWFB2pNfUZo5pbGm+JWf37659HP6qqaPzJhEiScHEugNVYAXyKeVmo?= =?us-ascii?Q?tmdoAxwVOHOc0wYzAKR1wmsPROimZwofl9B1IkBz+QrhJvmRhufQDK69ye/G?= =?us-ascii?Q?iaBY3WfZ0VG2Sqf+6xh8fYF28K+swqB0jvbuiZc/0EpphkNH8I/IoBEnWBLV?= =?us-ascii?Q?C5EoIBEh7TafH3/CPzGweq4VbZriiNknz59k1WRDurAwt2G/3GM6u9oJbm41?= =?us-ascii?Q?cZHXtpNdeZ/g1fyNFHYqWRHIuy+BSxnWrAu3tYLXUNjRC5xGPDSXXSWH/IqK?= =?us-ascii?Q?WfbuIJjKYAnNJJL4D/Orgf6nNhr8nKndgbyW9sNSK5Hwa9x3EJMk8wg9tmXM?= =?us-ascii?Q?FL/yyioU8EQ8hKTDQcSXKhJzP+sgwYagzwU452WPUFC4C7wv0AGQKbXbtZse?= =?us-ascii?Q?X2VXn0SxNhS8wD9d9LEf7Ti4/tFBLhS3AFZwB6RyHMJNxjZVzs02JsbVe7Jk?= =?us-ascii?Q?RB2qypR6eWYixdWx1QH+k+wCeM+ctmnZzccwFovJDFu1iq5SBGNH6C6Dj0Z+?= =?us-ascii?Q?T0SMwih1xdPbRPQi66ZNL+Fk1yEfIJWeRc7L/AsuqpimT32tVN5guzDEiFQn?= =?us-ascii?Q?ppu6vf02F9OEZjqobRIlRpb1OPpA9lYmWd913nli8GfdN0bB0dANLShbTnfg?= =?us-ascii?Q?GJqZK6QIEk67ymNkQItTo/JHOK/98i/IjkY/Do+8CfUsAYe8sPAAJJGtkM86?= =?us-ascii?Q?Y0azogU55+xXCz2g6oCPDWnH0OYZdm1DThLyDUfpNntsUWB+jTXtDvfJiU4l?= =?us-ascii?Q?RZirECls/R7UGqFVfsuzlYyykuEfFCGI8tBPKRPo6l1KJVImeKy4kVQHcRV+?= =?us-ascii?Q?bJETTC6IK7l12gi1r+zGoa6Q?= X-OriginatorOrg: yahoo-corp.jp X-MS-Exchange-CrossTenant-Network-Message-Id: e23910ab-68fc-4b81-31f0-08d97342d949 X-MS-Exchange-CrossTenant-AuthSource: TY2PR01MB2010.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2021 03:35:20.1703 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a208d369-cd4e-4f87-b119-98eaf31df2c3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Z9CVt1tD/EvOjdWI+19JpsXYCq4V7fy7NfNT1vUKvk4HG+5DdfpcGVfR39lrqn3zaD1pFpPQPBxZGWXl/u62/A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYAPR01MB2752 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.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: aoiwa@yahoo-corp.jp, Hiroki Narukawa 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.14 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 X-ZM-MESSAGEID: 1631158545137100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently disk-virtio-queues test is now using specifying a fake capability. By this commit this test will make use of DO_TEST_CAPS_LATEST. Signed-off-by: Hiroki Narukawa Reviewed-by: Peter Krempa --- .../qemuxml2argvdata/disk-virtio-queues.args | 20 +++++++---- .../disk-virtio-queues.x86_64-latest.args | 35 +++++++++++++++++++ tests/qemuxml2argvdata/disk-virtio-queues.xml | 5 ++- tests/qemuxml2argvtest.c | 3 +- .../disk-virtio-queues.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 2 +- 6 files changed, 55 insertions(+), 11 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest= .args create mode 120000 tests/qemuxml2xmloutdata/disk-virtio-queues.x86_64-late= st.xml diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.args b/tests/qemuxml= 2argvdata/disk-virtio-queues.args index c0166357e7..6637088a35 100644 --- a/tests/qemuxml2argvdata/disk-virtio-queues.args +++ b/tests/qemuxml2argvdata/disk-virtio-queues.args @@ -6,24 +6,30 @@ 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 \ -QEMU_AUDIO_DRV=3Dnone \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/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 \ --realtime mlock=3Doff \ +-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,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ --usb \ --drive file=3D/tmp/data.img,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0= \ --device virtio-blk-pci,num-queues=3D4,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive= -virtio-disk0,id=3Dvirtio-disk0,bootindex=3D1 \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-blockdev '{"driver":"file","filename":"/tmp/data.img","node-name":"libvir= t-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,num-queues=3D4,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvi= rt-1-format,id=3Dvirtio-disk0,bootindex=3D1 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args new file mode 100644 index 0000000000..6637088a35 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args @@ -0,0 +1,35 @@ +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":"/tm= p/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 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":"file","filename":"/tmp/data.img","node-name":"libvir= t-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,num-queues=3D4,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvi= rt-1-format,id=3Dvirtio-disk0,bootindex=3D1 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.xml b/tests/qemuxml2= argvdata/disk-virtio-queues.xml index c758d21894..ea1001bdd4 100644 --- a/tests/qemuxml2argvdata/disk-virtio-queues.xml +++ b/tests/qemuxml2argvdata/disk-virtio-queues.xml @@ -8,6 +8,9 @@ hvm + + qemu64 + destroy restart @@ -20,7 +23,7 @@
- +
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3b331d5fd4..59dfef52fd 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1339,8 +1339,7 @@ mymain(void) DO_TEST("disk-virtio-s390-zpci", QEMU_CAPS_DEVICE_ZPCI, QEMU_CAPS_CCW); DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW); DO_TEST("disk-order", QEMU_CAPS_VIRTIO_BLK_SCSI); - DO_TEST("disk-virtio-queues", - QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES); + DO_TEST_CAPS_LATEST("disk-virtio-queues"); DO_TEST_NOCAPS("disk-boot-disk"); DO_TEST_NOCAPS("disk-boot-cdrom"); DO_TEST_NOCAPS("floppy-drive-fat"); diff --git a/tests/qemuxml2xmloutdata/disk-virtio-queues.x86_64-latest.xml = b/tests/qemuxml2xmloutdata/disk-virtio-queues.x86_64-latest.xml new file mode 120000 index 0000000000..d6773202b7 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-virtio-queues.x86_64-latest.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/disk-virtio-queues.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 6d3526f91f..b88f7c404d 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -301,7 +301,7 @@ mymain(void) DO_TEST("disk-usb-device", QEMU_CAPS_DEVICE_USB_STORAGE); DO_TEST_NOCAPS("disk-virtio"); DO_TEST_NOCAPS("floppy-drive-fat"); - DO_TEST("disk-virtio-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES); + DO_TEST_CAPS_LATEST("disk-virtio-queues"); DO_TEST_NOCAPS("disk-boot-disk"); DO_TEST_NOCAPS("disk-boot-cdrom"); DO_TEST_NOCAPS("disk-error-policy"); --=20 2.17.1 From nobody Fri Apr 26 18:25:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1631158557616125.21764690058785; Wed, 8 Sep 2021 20:35:57 -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-404-uAnwjnefOWmMV37DJ4R-qQ-1; Wed, 08 Sep 2021 23:35:55 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5A41B104ECFC; Thu, 9 Sep 2021 03:35:50 +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 39FE460C81; Thu, 9 Sep 2021 03:35:50 +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 08AC64EA38; Thu, 9 Sep 2021 03:35:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1893ZUSc003994 for ; Wed, 8 Sep 2021 23:35:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0E7622095BA1; Thu, 9 Sep 2021 03:35:30 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 062ED2095BB3 for ; Thu, 9 Sep 2021 03:35:26 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E12338934E2 for ; Thu, 9 Sep 2021 03:35:25 +0000 (UTC) Received: from corp-ob09.yahoo-corp.jp (corp-ob09.yahoo-corp.jp [182.22.125.216]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-559-JTvq0KnkOm2ZpENSOEpOzA-1; Wed, 08 Sep 2021 23:35:23 -0400 Received: from JPN01-TY1-obe.outbound.protection.outlook.com (mail-ty1jpn01lp2056.outbound.protection.outlook.com [104.47.93.56]) by corp-ob09.yahoo-corp.jp (Postfix) with ESMTPS id 4ED2919FB18D for ; Thu, 9 Sep 2021 12:35:21 +0900 (JST) Received: from TY2PR01MB2010.jpnprd01.prod.outlook.com (2603:1096:404:10::15) by TYAPR01MB2752.jpnprd01.prod.outlook.com (2603:1096:404:82::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Thu, 9 Sep 2021 03:35:20 +0000 Received: from TY2PR01MB2010.jpnprd01.prod.outlook.com ([fe80::cce2:1d9a:207c:c06c]) by TY2PR01MB2010.jpnprd01.prod.outlook.com ([fe80::cce2:1d9a:207c:c06c%5]) with mapi id 15.20.4478.025; Thu, 9 Sep 2021 03:35:20 +0000 Received: from R-SUR-LBA-2603.yahoo.co.jp (211.14.29.147) by TYCPR01CA0024.jpnprd01.prod.outlook.com (2603:1096:405::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Thu, 9 Sep 2021 03:35:20 +0000 X-MC-Unique: uAnwjnefOWmMV37DJ4R-qQ-1 X-MC-Unique: JTvq0KnkOm2ZpENSOEpOzA-1 From: Hiroki Narukawa To: libvir-list@redhat.com Subject: [PATCH 2/5] qemu: add disk queue count ABI stability check Date: Thu, 9 Sep 2021 12:34:45 +0900 Message-Id: <20210909033448.7018-3-hnarukaw@yahoo-corp.jp> In-Reply-To: <20210909033448.7018-1-hnarukaw@yahoo-corp.jp> References: <20210909033448.7018-1-hnarukaw@yahoo-corp.jp> X-ClientProxiedBy: TYCPR01CA0024.jpnprd01.prod.outlook.com (2603:1096:405::36) To TY2PR01MB2010.jpnprd01.prod.outlook.com (2603:1096:404:10::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d5e876b7-e19d-4c93-93e3-08d97342d9a0 X-MS-TrafficTypeDiagnostic: TYAPR01MB2752: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:260 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: l32eL7S9tJrG+2+jDkb4Uh0vxYLyFKCFgccojQF3YPsDvLdAOlPGlaPEEIPIX2hr5OEL39xU3GRjtyAi+97zW2OHMHtjeWTqGY3ljea8X7ygrGoVEIhvta4pkHgkUQ02Z2fIK10w5hxvpBWm/GudePigmexd2m92hjPdV5Z3YDs6VqBN/TO/6DKSeTcHzzBrYjnmmYmMGm8qIbsDl/Kq5DFdy0QQgNOWH2Zv4G1lbNo/MRIdNCjhx9K25tRq4T1BZCNs7t14MfZdMWNfGnVIbgUYHoo2AEuv2EYaUSmuVeTIPERx8iW0rRYbsRdrLYgUsfp6oqhgbx7jGTVT4P4q+3UOl5P98oKB6CNcSetVOdBjduk0ALSvtAzlOJuhs2bjOPjyXNZFOGgIKXEZ09OhHjtI8atLNPXjjF1c9/3e/TgbymuTKa+bd1iptP9OB6Q9ciq/zPLBeAtwLGZKwMwoJ0uMwELClEpz+gD7HwxGt7FQvOpI+1dK7V3N++i4QDoK33Ky1Lwr8AiTV2NoZ2G3Fk6ckmtbV4EjyeG65Hxy7ywe/BA7KRWVzpKZtPe2D27GSB+xMd7k66pFJqPS9A5VJ4dJuJZFUAqzQt0imEN2HsiC+LmfqhuAKZwbwPLCfZ7MpsEnDf6v3zWIhBiJNWP97HBWv6e0l6IpYqCQDKaU4dy2+XUjPZyYBaTy63ZX+wJSyCEPMy29LKpw75+swExoIg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TY2PR01MB2010.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(136003)(346002)(366004)(39860400002)(396003)(107886003)(956004)(2906002)(2616005)(186003)(66556008)(66476007)(6506007)(26005)(52116002)(86362001)(6916009)(36756003)(8936002)(6666004)(4744005)(4326008)(38350700002)(38100700002)(8676002)(5660300002)(66946007)(316002)(6512007)(478600001)(6486002)(1076003); DIR:OUT; SFP:1102 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9W9QGwXWmNOec+UtAxp/ZNPoGjbFacmJ6SSLftyjVqRrSMpvZm5N1fApSlAM?= =?us-ascii?Q?Z4PxPG5eJoZkOn0gvjXCkJbo3lSmuLiOJ1BHDDH+J06Kq/v2cOJGIy0YYmNk?= =?us-ascii?Q?JNa99JpZJrm39n5W2AveEi1ihziXoDJk3vUAZxlEg1V/BX3nLJt3/1pTu234?= =?us-ascii?Q?HMNb8ASXaUgYSKU23RFLE1ChzsJpCKqjx18TfuHuImAfyhdb6tvOuLyCP5UA?= =?us-ascii?Q?JTsfYTsi0jVSvS/Adn8qDTODYNhGNfE86YVHTtS3SpErcfe+7NzWoi1f9EMc?= =?us-ascii?Q?TGQFzkUH4cikGlOXthIRmqB4tRJzOki3ntXMgv3oEtQKZDc3z/dAMwjHaV/T?= =?us-ascii?Q?8R42z0KlpDMkvFr159z4MF6YOmXAl9KUzVaO2tYQt5ZI2hYGyQU4Is7YCkK5?= =?us-ascii?Q?RoK+of5pT9rq+ZVnRG6KKRYFXeug89lfRpzdTGHE1oWi5HsmN0LbFGDySvkl?= =?us-ascii?Q?OmbJxHo6m81ASyLCHtbbX9rPuu1HPDJnvZTYgzxXesbP7sscmwHiFbRX63Wg?= =?us-ascii?Q?oUAzQGLOzJTTTS0Yg3UwhQC7FO3CQwbLoh3dRCZDpq0wQ/4IjPvaPpXqTJLn?= =?us-ascii?Q?pwexOdT63n4haNmB6oWsx96KJ2nV/TLhqyJsrY1QsZlab807qF3s7WbhnHLD?= =?us-ascii?Q?Ptl8kzgBcCwN1m2WXOrpjgRRsHo2zRLRk+dj8O5e8/jCMeXLovCwCfN9ru+l?= =?us-ascii?Q?AL8A8pCMGdRfaGJDwckUnVjqPG5409Xvhvqw0ykZ/p3xh7efp3z5/qfspCO8?= =?us-ascii?Q?EXdGiVhXo7KmIuYaFyodsQ0g9WeD2wr3u4tXTT2b3VACwdQ/jjQwhT9flXvB?= =?us-ascii?Q?Z/oR0qSJZrO8eUPrbRg+yGmHB/Mv5SyScTmS9W7xpl3j8JuzMbJ0UnfVbbcT?= =?us-ascii?Q?2KKWBbdiVwI5VnFgHlaJrgjcAHxkSyFxe3xoWpC37tyml85jf/a5oKc2hbQ0?= =?us-ascii?Q?0sdQ5vsehja6NwbsYjUEmeegR5vHLl1qShQSvgrrTLCdlLmac/3+GsIFa9Kc?= =?us-ascii?Q?vJIpio2rd2Z6fbZ3zPER40lhyAg6mz1ie41K1P5pkkXlWuLxlbFEMgGR0hR6?= =?us-ascii?Q?cMPKteJ9Ob32E5ZYUQdpa6hVAK/vTKnDImSY6AVsXAT2rQCas/yMtJ+96ANb?= =?us-ascii?Q?ZIqjnWjYFG1EPBdNAMTahcqkg3aeWx01UEI/EbHhjm+ycct0kcKwq1XCDxMl?= =?us-ascii?Q?05wHXb32ikye0YrhCs+pc3WkEti32if+eeJVfsnpQm/UNw/RZGYNNtLb09OQ?= =?us-ascii?Q?LTTpQvna1wKANG7kPNFkULLr6CrOg1Nc9V+zpRP0SKPojB6lc4Aqf+XNfDD8?= =?us-ascii?Q?EPly6+oYK6AuabwesKChCbG1?= X-OriginatorOrg: yahoo-corp.jp X-MS-Exchange-CrossTenant-Network-Message-Id: d5e876b7-e19d-4c93-93e3-08d97342d9a0 X-MS-Exchange-CrossTenant-AuthSource: TY2PR01MB2010.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2021 03:35:20.7790 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a208d369-cd4e-4f87-b119-98eaf31df2c3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 85i3ZVSFPdfl5rfadYQyctNPEcHs6qZ0pB5TUkbnQzatc0wAwFtUSkqJxtX23BO5eC6TnL3C6GtkUJsYFKMwyA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYAPR01MB2752 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.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: aoiwa@yahoo-corp.jp, Hiroki Narukawa 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.12 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 X-ZM-MESSAGEID: 1631158558787100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" virtio-blk num-queue is visible to guest OS, so this must be kept while liv= e migration. Signed-off-by: Hiroki Narukawa Reviewed-by: Peter Krempa --- src/conf/domain_conf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index dbefc98ee8..6cc1f78ec2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -20766,6 +20766,13 @@ virDomainDiskDefCheckABIStability(virDomainDiskDef= *src, return false; } =20 + if (src->queues !=3D dst->queues) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target disk queue count %u does not match source= %u"), + dst->queues, src->queues); + return false; + } + if (!virDomainVirtioOptionsCheckABIStability(src->virtio, dst->virtio)) return false; =20 --=20 2.17.1 From nobody Fri Apr 26 18:25:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1631158543393638.5663973859446; Wed, 8 Sep 2021 20:35: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-60-GtzPv0uEOPy99pvpPOPGDg-1; Wed, 08 Sep 2021 23:35:40 -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 BA6EF18414A1; Thu, 9 Sep 2021 03:35:35 +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 89D5F1346F; Thu, 9 Sep 2021 03:35:35 +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 985224EA2A; Thu, 9 Sep 2021 03:35:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1893ZUuc003993 for ; Wed, 8 Sep 2021 23:35:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0B9E92094D38; Thu, 9 Sep 2021 03:35:30 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 05C712095BB2 for ; Thu, 9 Sep 2021 03:35:26 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F0DA18934E5 for ; Thu, 9 Sep 2021 03:35:25 +0000 (UTC) Received: from corp-ob10.yahoo-corp.jp (corp-ob10.yahoo-corp.jp [182.22.125.210]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-561--3t5Cr5eNK-xJuBPSHJJXw-1; Wed, 08 Sep 2021 23:35:24 -0400 Received: from JPN01-TY1-obe.outbound.protection.outlook.com (mail-ty1jpn01lp2054.outbound.protection.outlook.com [104.47.93.54]) by corp-ob10.yahoo-corp.jp (Postfix) with ESMTPS id D666C19FB190 for ; Thu, 9 Sep 2021 12:35:21 +0900 (JST) Received: from TY2PR01MB2010.jpnprd01.prod.outlook.com (2603:1096:404:10::15) by TYAPR01MB2752.jpnprd01.prod.outlook.com (2603:1096:404:82::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Thu, 9 Sep 2021 03:35:21 +0000 Received: from TY2PR01MB2010.jpnprd01.prod.outlook.com ([fe80::cce2:1d9a:207c:c06c]) by TY2PR01MB2010.jpnprd01.prod.outlook.com ([fe80::cce2:1d9a:207c:c06c%5]) with mapi id 15.20.4478.025; Thu, 9 Sep 2021 03:35:21 +0000 Received: from R-SUR-LBA-2603.yahoo.co.jp (211.14.29.147) by TYCPR01CA0024.jpnprd01.prod.outlook.com (2603:1096:405::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Thu, 9 Sep 2021 03:35:20 +0000 X-MC-Unique: GtzPv0uEOPy99pvpPOPGDg-1 X-MC-Unique: -3t5Cr5eNK-xJuBPSHJJXw-1 From: Hiroki Narukawa To: libvir-list@redhat.com Subject: [PATCH 3/5] qemu: add queue_size option to disk Date: Thu, 9 Sep 2021 12:34:46 +0900 Message-Id: <20210909033448.7018-4-hnarukaw@yahoo-corp.jp> In-Reply-To: <20210909033448.7018-1-hnarukaw@yahoo-corp.jp> References: <20210909033448.7018-1-hnarukaw@yahoo-corp.jp> X-ClientProxiedBy: TYCPR01CA0024.jpnprd01.prod.outlook.com (2603:1096:405::36) To TY2PR01MB2010.jpnprd01.prod.outlook.com (2603:1096:404:10::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8d3d36e0-cd70-40f4-59b8-08d97342d9f7 X-MS-TrafficTypeDiagnostic: TYAPR01MB2752: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:972 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: c3dhlHb8byXk1wkXEpBWVJc0B3Tb/Nv/oGgceV/3+aT36Ktk12zOYF8zStRQa2ovdJCoE+vlrrjPoad9xC23dXmrY3I+P5TrWJhAnsiX/WN1XWJSIatLZ6EWFhJbjdLyW6SiVpLw01Si5Sirm39BmZ5crIapJO6ju50Hhwcm4cg6bAB0wxkp5R6BB3WUfOlVp5QhzRr+H3k68MitVpvA39gYQvberQh0ZRNp0VIoqgEWURY4ZgdU+jEp0ehpFz8CNgLJP6PHC+3hTMRvn5+At+2cuwatX0meaQEKx+8scUb1ZNMUouXK5Le08u52ZleRhrFlFYfuWoGoRaRnbQ3fs0GI9gGdWFKw/HSfUFAYSWQCh1UO3CTzr/+oavPaI+Od1GfchdTYn3MwvHoiiyKvV2HExkaYsDRq+hr9sDY+cD08wcolqPCsVgcYoYq2LH+8vtkWwT04BFzLoptFQMjSsJt76FJEostwneip60DUwRtWEGOxMKllmK+MVqsHVG4Hxfi1mZAextdyELQDpPQI+XqDq+eyrUG2pnSEGr+izzF7UWW7uNyrXrHMxvwGA52RtReUAHYwB7O01JPT7lIIv9SGsG4OARWlSbILEJun8R5vp3p97z4l6vK79KtDGIQ6ld64koSjP1Ao7E3OuXboAVfWPL1li0WcMGqWYnXdfSsoG37d1OLwNLfq5uRu7ITz X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TY2PR01MB2010.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(136003)(346002)(366004)(39860400002)(396003)(83380400001)(107886003)(956004)(2906002)(2616005)(186003)(66556008)(66476007)(6506007)(26005)(52116002)(86362001)(6916009)(36756003)(8936002)(6666004)(4326008)(38350700002)(38100700002)(8676002)(5660300002)(66946007)(316002)(6512007)(478600001)(6486002)(1076003); DIR:OUT; SFP:1102 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0q2ZX3176D+uj8ygf9ZFkUoZVZOBWAdLMZHD/WLsNN2T4yNX79BaKDwmw4rR?= =?us-ascii?Q?WjWPTwiikd6Ce6cleK1qG6sXK+tbfAOV6/rlZJQKqfPM2xoR/pjt2rAapFRs?= =?us-ascii?Q?JVfbjjDRpjXK1RiwveZjwl3wiVmAHo/U29sx+IDyIUIQuWedsUGPiP2Ni79K?= =?us-ascii?Q?JI9NhOzfO203vYP0QpBiamsBlmjXUYwjo0h/lwXkAO5S6wV/Mk7fPwEW5AO8?= =?us-ascii?Q?cnamonPnEhlZWaN3BtRZfNYMlBGSiNqvt12Jf8D8QACXWM2hl6fuF1IuevP5?= =?us-ascii?Q?NOOjm1wsRc4MIIz4MldBD1dW9ofjnqTu5P/Hczww8JDJ+UMlMqQDO4Bh1JPK?= =?us-ascii?Q?mSju+oYWFt8nK6RnEWzn8DEHa2kH41Lbd7xZx/Nakcmu0U/APfrmZG/7ql6z?= =?us-ascii?Q?XqYtb5B4+EbgVX5ErAIF2OS14R2qRqct9MooJuFH+MYvm/yL93xfV6hXUabe?= =?us-ascii?Q?uyDO1acoASH0WOPlVBAgDN0TNnhX00FeCG8bsyH1L3XkjOX/X0J/NDpXwufL?= =?us-ascii?Q?wcXWhegCxLXMvNclRK5mt4oBoyLXYh5hYjM5sBrSEu7gNu7pboMw4e+tokS6?= =?us-ascii?Q?W0NOv2Z886a0b/nWYUUvByWQfKx2Fm4Le1dnwKUZ3y+WHhaJnk81uRWERALq?= =?us-ascii?Q?Ohm3UqdXPShHlvP4MR6s7I1FbXY356vrrLwTKQxofAopwlRGae0hOB2Dj/Uv?= =?us-ascii?Q?wVBdKKppQQUlDXWUx4pupm1tyF/QpvlyeL4eUdI96z0KNjy2/wN8yNwRlohl?= =?us-ascii?Q?367VvJGhnm+QM98gUDzacB2TlAj4pZGsNO9C36UvqKKtgWnFvU6qGrwgGJlC?= =?us-ascii?Q?v9ps2oUA8vVavNSAV6QX4GlCf42+43tfTr9zm2q0Rs8KA/1bbyF5cwLirzaw?= =?us-ascii?Q?h8j2Eh1RX1pAoO6o3i9J1Lyr+lW1kFLPoun6LAMQp/SLXM+Kfo3P7DP4oMFO?= =?us-ascii?Q?vY6R3ZFeOhWbcJ65/+qutwIc8BapVyVY7ClMnEefns3X+wQ2FptvhWHFWm0C?= =?us-ascii?Q?A6DS+kW/cMhl9AH30tlEmELt7qzzGlvioI+j4PYlUzcAPu4BCV0c1SZn+/T9?= =?us-ascii?Q?8jbeDhWsIv2lxNlFtJgqNktBRaB/3MuxYI/gS64d84sdvbtBDfNu1nXgsb44?= =?us-ascii?Q?3+2zE3sESlpxbIhfeL7OgYFPAfvEd6aIJiDQ6T6/ZWBgm7+RHX/SJCJr/w/Z?= =?us-ascii?Q?nFWt/EF3qtNx4pazIpzeal7HSYOzoDPzzGoFmk75Z4Mecl09OlGWOvCUccSK?= =?us-ascii?Q?ecgLjKj/Q3ZiSl0ZmLMudGecG/wARmle7t5kJpJv9U/HjXDbOzAOZ0bkpAR7?= =?us-ascii?Q?Wk1dE4HVKkikSVWVjuick1lL?= X-OriginatorOrg: yahoo-corp.jp X-MS-Exchange-CrossTenant-Network-Message-Id: 8d3d36e0-cd70-40f4-59b8-08d97342d9f7 X-MS-Exchange-CrossTenant-AuthSource: TY2PR01MB2010.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2021 03:35:21.3246 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a208d369-cd4e-4f87-b119-98eaf31df2c3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vX67YVK0sPJ2JYRFQMJtAvw83P8OIERafncwHZLMyyaq+3rAgcB1NYtpcAAa/sHQ443jjHwMXhaK9ThchM3X0w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYAPR01MB2752 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.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: aoiwa@yahoo-corp.jp, Hiroki Narukawa 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 X-ZM-MESSAGEID: 1631158545134100002 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The option "queue-size" in virtio-blk was added in qemu-2.12.0, and default= value increased from qemu-5.0.0. However, increasing this value may lead to drop of random access performanc= e. To add disk queue_size option, first this commit add interface to accept. Signed-off-by: Hiroki Narukawa --- docs/formatdomain.rst | 4 +++- docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 13 +++++++++++++ src/conf/domain_conf.h | 1 + 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 479a3acfbb..617a892b38 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -2474,7 +2474,7 @@ paravirtualized driver is specified via the ``disk`` = element. - + @@ -3085,6 +3085,8 @@ paravirtualized driver is specified via the ``disk`` = element. (QEMU 2.1)` - The optional ``queues`` attribute specifies the number of virt queue= s for virtio-blk. ( :since:`Since 3.9.0` ) + - The optional ``queue_size`` attribute specifies the size of each virt + queue for virtio-blk. ( :since:`Since 7.8.0` ) - For virtio disks, `Virtio-specific options <#elementsVirtio>`__ can = also be set. ( :since:`Since 3.5.0` ) - The optional ``metadata_cache`` subelement controls aspects related = to the diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 11fa24f398..fdc04f90aa 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2363,6 +2363,11 @@ + + + + + diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6cc1f78ec2..123e9b694a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8930,6 +8930,9 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *def, if (virXMLPropUInt(cur, "queues", 10, VIR_XML_PROP_NONE, &def->queues)= < 0) return -1; =20 + if (virXMLPropUInt(cur, "queue_size", 10, VIR_XML_PROP_NONE, &def->que= ue_size) < 0) + return -1; + return 0; } =20 @@ -20773,6 +20776,13 @@ virDomainDiskDefCheckABIStability(virDomainDiskDef= *src, return false; } =20 + if (src->queue_size !=3D dst->queue_size) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target disk queue size %u does not match source = %u"), + dst->queues, src->queues); + return false; + } + if (!virDomainVirtioOptionsCheckABIStability(src->virtio, dst->virtio)) return false; =20 @@ -23423,6 +23433,9 @@ virDomainDiskDefFormatDriver(virBuffer *buf, if (disk->queues) virBufferAsprintf(&attrBuf, " queues=3D'%u'", disk->queues); =20 + if (disk->queue_size) + virBufferAsprintf(&attrBuf, " queue_size=3D'%u'", disk->queue_size= ); + virDomainVirtioOptionsFormat(&attrBuf, disk->virtio); =20 if (disk->src->metadataCacheMaxSize > 0) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index c7e6df7981..688a842660 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -584,6 +584,7 @@ struct _virDomainDiskDef { virDomainDiskDetectZeroes detect_zeroes; char *domain_name; /* backend domain name */ unsigned int queues; + unsigned int queue_size; virDomainDiskModel model; virDomainVirtioOptions *virtio; =20 --=20 2.17.1 From nobody Fri Apr 26 18:25:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1631158566180693.7409942035209; Wed, 8 Sep 2021 20:36:06 -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-348-uFMN1o5PMuGE9KhZZVcN-g-1; Wed, 08 Sep 2021 23:36:03 -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 95C5410060E7; Thu, 9 Sep 2021 03:35:58 +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 766356B54E; Thu, 9 Sep 2021 03:35:58 +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 47BB51806D01; Thu, 9 Sep 2021 03:35:58 +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 1893ZV1u004017 for ; Wed, 8 Sep 2021 23:35:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id CDB5EFA75E; Thu, 9 Sep 2021 03:35:31 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C6B18BC86 for ; Thu, 9 Sep 2021 03:35:29 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EEFFE101A529 for ; Thu, 9 Sep 2021 03:35:28 +0000 (UTC) Received: from corp-ob07.yahoo-corp.jp (corp-ob07.yahoo-corp.jp [183.79.94.94]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-21-CeKFupFhNHyzxX141LekNg-1; Wed, 08 Sep 2021 23:35:26 -0400 Received: from JPN01-TY1-obe.outbound.protection.outlook.com (mail-ty1jpn01lp2059.outbound.protection.outlook.com [104.47.93.59]) by corp-ob07.yahoo-corp.jp (Postfix) with ESMTPS id 7E88C19FB188 for ; Thu, 9 Sep 2021 12:35:23 +0900 (JST) Received: from TY2PR01MB2010.jpnprd01.prod.outlook.com (2603:1096:404:10::15) by TYAPR01MB6283.jpnprd01.prod.outlook.com (2603:1096:400:84::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.20; Thu, 9 Sep 2021 03:35:22 +0000 Received: from TY2PR01MB2010.jpnprd01.prod.outlook.com ([fe80::cce2:1d9a:207c:c06c]) by TY2PR01MB2010.jpnprd01.prod.outlook.com ([fe80::cce2:1d9a:207c:c06c%5]) with mapi id 15.20.4478.025; Thu, 9 Sep 2021 03:35:22 +0000 Received: from R-SUR-LBA-2603.yahoo.co.jp (211.14.29.147) by TYCPR01CA0024.jpnprd01.prod.outlook.com (2603:1096:405::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Thu, 9 Sep 2021 03:35:21 +0000 X-MC-Unique: uFMN1o5PMuGE9KhZZVcN-g-1 X-MC-Unique: CeKFupFhNHyzxX141LekNg-1 From: Hiroki Narukawa To: libvir-list@redhat.com Subject: [PATCH 4/5] qemu: add QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE capability Date: Thu, 9 Sep 2021 12:34:47 +0900 Message-Id: <20210909033448.7018-5-hnarukaw@yahoo-corp.jp> In-Reply-To: <20210909033448.7018-1-hnarukaw@yahoo-corp.jp> References: <20210909033448.7018-1-hnarukaw@yahoo-corp.jp> X-ClientProxiedBy: TYCPR01CA0024.jpnprd01.prod.outlook.com (2603:1096:405::36) To TY2PR01MB2010.jpnprd01.prod.outlook.com (2603:1096:404:10::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 139597f1-a679-499a-9c5c-08d97342da5c X-MS-TrafficTypeDiagnostic: TYAPR01MB6283: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:335 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: 5A9o/9oShqxI4mP0aABFiHOecsOXur2JF8j5SWSbH6QqY8lJ12+jmrktApY/DK1sqzjSuxnbJaXxmYP+I2tMzOXrSlD+U+3PTLgBg4GvoQPLTYsYM59GpYLqyqxe7XbZGJ5NA5AkWkKhDNHhgRtwi3Zol0qqCVHvxWn/3oOdpnpteUIGn/736ANyIxgESQc2Z85vRA16S4XJGGO6053ylJ8pDY2KNDsu4samOFf7RbYxxfaYHY/c66SjWvZHxyACCMKHE8QfOhVFjEm92rIZePbWmWKn3ngm3OY+4yps/icIFjSo9EzVbibf6W8N1kq8W2P7daHCtY1tCJ0rydVTvV2MQGyucFJOaAtpdyrBPE8qoP7F2Bbmqtfud0tdfP1hwigpIlxI08eW+0wadM28XOzolldtNtBACWGCi1VjZzXCPJmXZbvm4fhMa7p5G/Cm4Q0VvYozTxIZoYlniL9krt+iLNtfDFJRh2oT4aNBAdvzJVoWiDcKlE6+qcufwG8zEAg2DtSMvALpWXT5IBPlBwr+d6RTRi5oi4PI4hySn2kNMSPYoE1N83/pJ2q0EyDdabKhKJR/RThZc5Zz82JmHiVWNb6t80mSn1dCyetJmJ2mjeKzEanQyle05Hj8bK8XreWAPHGpeRkmSoo21KqWGOa5u8o/6RIXbG+G3vCnvC11r0syKcGUSp3xCZRVAoUk+VZGeaeqZkpG8SHfVIxmIA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TY2PR01MB2010.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(376002)(346002)(39860400002)(396003)(366004)(6666004)(6506007)(2906002)(6916009)(4326008)(86362001)(26005)(36756003)(6512007)(2616005)(186003)(5660300002)(66946007)(8936002)(30864003)(956004)(316002)(38100700002)(66556008)(38350700002)(66476007)(52116002)(6486002)(107886003)(83380400001)(478600001)(1076003)(8676002); DIR:OUT; SFP:1102 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?PKT60x0eutgffT40OGa9M3Pcltzq1UUdcxzZE5ifseex10Iza8yK1L/CQvOx?= =?us-ascii?Q?2UnIYr1nDuRdYvJGZTjsjFD3Mn/GRL2U3B9blSP50TL7UbEMUXbEbzfNVKny?= =?us-ascii?Q?kTpo4X/+TXtiJSASGszx0knkck2ikNhy5o1ELZzXMf2v4HiyRrkcKd8VVdQY?= =?us-ascii?Q?2fSnpHI57cy6cmZ+s9j/9DFBWpnKSxj68VD4DJfDqpHnx3IThPxjEv5Z2+3C?= =?us-ascii?Q?F3oqspaPos9Odm5kb/s21f+Og4IVSuPw3HmIAn5T56BxmlxEaMMmrwhesdp5?= =?us-ascii?Q?S+3MV2QOrli2SISXs7sbRhe0Y5ueyoIFvJdrg+aYm3vlrKGZcQY7pkflEI6P?= =?us-ascii?Q?XW+A/oE8imlVG+4BpOaBKg8Syt/4W4Kv4rsxmoG8XHFGFP3XOfj8v1xEk+Xo?= =?us-ascii?Q?hhOnCRoN/8AFnOhKUMjck88uV/mjzx3H47NQ7g/S0ljJuPgpIrjTPHlrke8r?= =?us-ascii?Q?nz0DC3+KfYvuPXiHy1ZjJm+OGdkVHaiDwBtmpdmu83BpxVyKPmQB9yDuAut2?= =?us-ascii?Q?FHai6YHS3ctnrN6FSvui/MG8dmfxGAMikPvRL3fE61lX9I+hFe/yEneuE/I4?= =?us-ascii?Q?4dCcy756dtt3/fa42536DNxpdemXa6/JxI/QME5ZJLyNa/4opOa4KkK3qcem?= =?us-ascii?Q?KSvfsQqH2sZ83MHoW/vRainzeIYNefp9smlnUz4sB6Px9eXZWDDOC2gb3ODG?= =?us-ascii?Q?r2IvIsCN3nxzGmUAHSRLJpbfO6sBL4Q3BK1potXhH9TLz5FeoVGUQjQqo3Nn?= =?us-ascii?Q?vvURLM3TObCZu0SMnFQxjOsjG5RKXMASuTu1w6LO+qY4iF44485vN6jLMrb7?= =?us-ascii?Q?j1NlTMOm3OfeQg9Ce5duF/nqrE7qqJDionqpko7VUphilS0RLmjSV64Y3zC5?= =?us-ascii?Q?IsSaNNAXJsWIVkgm0IHoSqAvYTLCSVdA6HzDz006h1IYDcLe0+94tH2gRLQE?= =?us-ascii?Q?BStXA0vlwwPnv3xkJkz2tVvptOoijI5CGGXc/y9V6xJUCxQu/GaMobMXOBCU?= =?us-ascii?Q?gFGJjpchHuJUBBBjRY1yOj62vaWihf7+WvflJgUPH3IsrNOmkXaeUiAG8okW?= =?us-ascii?Q?riHEyObyfxep7l3nGBAnJogGYjGmtSZWO+1T6KvrldWKjoBG07fLDgWfjqgS?= =?us-ascii?Q?Cnm5t2/j6NygVEW/iJ2MzlQD62oEdSuGMTfBRy1JKn0K1XB4LtjAe0cio0p7?= =?us-ascii?Q?uMp/zKBctYnZcmr5wMzCH4tm9oCEKYJnbEypcdz9GKF0nz7Vm0EsK2lscyUP?= =?us-ascii?Q?L8A+qhLPzfC4AQ+4ulZW+EAHuxSXb4r5/CY+vwIMCNfBoMI/YX00QVEQQJuR?= =?us-ascii?Q?ZWX6gBNyG7f8xn6SOWVXav2y?= X-OriginatorOrg: yahoo-corp.jp X-MS-Exchange-CrossTenant-Network-Message-Id: 139597f1-a679-499a-9c5c-08d97342da5c X-MS-Exchange-CrossTenant-AuthSource: TY2PR01MB2010.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2021 03:35:21.9823 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a208d369-cd4e-4f87-b119-98eaf31df2c3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 97oXJCyGVd58eel5oOOTaz/NyiP6z/I1/pudLX9zdxdDHSHzi0IgyCBwJxOaUl/CqtViQuTlG8TF6TzGeMa+iQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYAPR01MB6283 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: aoiwa@yahoo-corp.jp, Hiroki Narukawa 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 X-ZM-MESSAGEID: 1631158567223100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" To support virtio-blk queue-size option, this commit adds capability detect= ion to the option. Signed-off-by: Hiroki Narukawa --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 + 36 files changed, 37 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 70c3ec2f0c..9534641f81 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -638,6 +638,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "query-display-options", /* QEMU_CAPS_QUERY_DISPLAY_OPTIONS = */ "s390-pv-guest", /* QEMU_CAPS_S390_PV_GUEST */ "set-action", /* QEMU_CAPS_SET_ACTION */ + "virtio-blk.queue-size", /* QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE = */ ); =20 =20 @@ -1398,6 +1399,7 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps= DevicePropsVirtioBlk[] =3D { { "scsi", QEMU_CAPS_VIRTIO_BLK_SCSI, virQEMUCapsDevicePropsVirtioBlkSC= SIDefault }, { "logical_block_size", QEMU_CAPS_BLOCKIO, NULL }, { "num-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, NULL }, + { "queue-size", QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE, NULL }, { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL }, { "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, NULL }, { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, NULL }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index bc762d1916..268c8350da 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -618,6 +618,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_QUERY_DISPLAY_OPTIONS, /* 'query-display-options' qmp comman= d present */ QEMU_CAPS_S390_PV_GUEST, /* -object s390-pv-guest,... */ QEMU_CAPS_SET_ACTION, /* 'set-action' QMP command */ + QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE, /* virtio-blk-*.queue-size */ =20 QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.12.0.aarch64.xml index 3cd71919bc..4c7208d641 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -158,6 +158,7 @@ + 2012000 0 61700289 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemuc= apabilitiesdata/caps_2.12.0.ppc64.xml index 2081592b51..2b6e7e7135 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -157,6 +157,7 @@ + 2011090 0 42900289 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.12.0.s390x.xml index deabb614ba..05bd930e64 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -122,6 +122,7 @@ + 2012000 0 39100289 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.12.0.x86_64.xml index 3cc5c86e4d..125b1256e6 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -201,6 +201,7 @@ + 2011090 0 43100289 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_3.0.0.ppc64.xml index 19af15c345..ddb52837c9 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -159,6 +159,7 @@ + 2012050 0 42900239 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_3.0.0.s390x.xml index 8e90d32de9..a573d88160 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -125,6 +125,7 @@ + 3000000 0 39100239 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_3.0.0.x86_64.xml index ff9f88d873..318abf9ea0 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -207,6 +207,7 @@ + 3000000 0 43100239 diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_3.1.0.ppc64.xml index 9c217263ca..f384a7b9db 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -164,6 +164,7 @@ + 3000091 0 42900240 diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_3.1.0.x86_64.xml index a80d381b71..482ef90246 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -211,6 +211,7 @@ + 3000092 0 43100240 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.aarch64.xml index efb891fa01..7b2f6c2f28 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -174,6 +174,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 1e2b7c7fe6..2107136a5d 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -181,6 +181,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 5872ecd491..9ec5904595 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -173,6 +173,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 bb76faae2b..d2d13be129 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -173,6 +173,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 51074b4f37..9a5cc1fcc7 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -137,6 +137,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 19b8a49394..7acf71d088 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -219,6 +219,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 841b753518..2a7411b943 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -226,6 +226,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 8116624181..600e4a5649 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -189,6 +189,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 d37c9b3426..68318e2eaa 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -188,6 +188,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 258e382232..5b3467d22c 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -150,6 +150,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 6e3aa7f5d9..a73bed50b3 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -237,6 +237,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 4ce8244540..826b398bd8 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -199,6 +199,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 07e00008ee..0365998fc7 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -207,6 +207,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 1bbb9b98cd..fe09a6868a 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -193,6 +193,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 0c28645f69..1a25328620 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -244,6 +244,7 @@ + 5000000 0 43100241 diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index fd77d9bbc9..d35a826140 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -246,6 +246,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 4e31d8245e..fc0fd3f5ec 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -203,6 +203,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 ac81364857..ea5c58a8c1 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -209,6 +209,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 21a1a5c3dd..a23b432037 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -195,6 +195,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 13caca9626..0dba47beed 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -157,6 +157,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 234ac8f7ef..09a2517137 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -247,6 +247,7 @@ + 5002000 0 43100243 diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0.aarch64.xml index dcc41ed067..acf2a6bbdc 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -211,6 +211,7 @@ + 6000000 0 61700242 diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index ebcca6e114..c704f0085c 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -165,6 +165,7 @@ + 6000000 0 39100242 diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index 4951644354..b423f57d87 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -255,6 +255,7 @@ + 6000000 0 43100242 diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index eca9facf80..49efead697 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -257,6 +257,7 @@ + 6001000 0 43100243 --=20 2.17.1 From nobody Fri Apr 26 18:25:44 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; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com 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 1631158563972756.1812507846786; Wed, 8 Sep 2021 20:36:03 -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-595-Fcs5jiu-PXO7Ju7qPyDD6Q-1; Wed, 08 Sep 2021 23:36:00 -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 DED1B18414A1; Thu, 9 Sep 2021 03:35:55 +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 C00586B55D; Thu, 9 Sep 2021 03:35:55 +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 8FF6A4EA39; Thu, 9 Sep 2021 03:35:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1893ZVLg004012 for ; Wed, 8 Sep 2021 23:35:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 85E2E10145F9; Thu, 9 Sep 2021 03:35:31 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 80C6D1011011 for ; Thu, 9 Sep 2021 03:35:28 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BB991811E76 for ; Thu, 9 Sep 2021 03:35:28 +0000 (UTC) Received: from corp-ob07.yahoo-corp.jp (corp-ob07.yahoo-corp.jp [183.79.94.94]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-45-edaPJklXOl2kPt0GA7-nBg-1; Wed, 08 Sep 2021 23:35:26 -0400 Received: from JPN01-TY1-obe.outbound.protection.outlook.com (mail-ty1jpn01lp2059.outbound.protection.outlook.com [104.47.93.59]) by corp-ob07.yahoo-corp.jp (Postfix) with ESMTPS id 64EB719FB183 for ; Thu, 9 Sep 2021 12:35:23 +0900 (JST) Received: from TY2PR01MB2010.jpnprd01.prod.outlook.com (2603:1096:404:10::15) by TYAPR01MB6283.jpnprd01.prod.outlook.com (2603:1096:400:84::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.20; Thu, 9 Sep 2021 03:35:22 +0000 Received: from TY2PR01MB2010.jpnprd01.prod.outlook.com ([fe80::cce2:1d9a:207c:c06c]) by TY2PR01MB2010.jpnprd01.prod.outlook.com ([fe80::cce2:1d9a:207c:c06c%5]) with mapi id 15.20.4478.025; Thu, 9 Sep 2021 03:35:22 +0000 Received: from R-SUR-LBA-2603.yahoo.co.jp (211.14.29.147) by TYCPR01CA0024.jpnprd01.prod.outlook.com (2603:1096:405::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Thu, 9 Sep 2021 03:35:22 +0000 X-MC-Unique: Fcs5jiu-PXO7Ju7qPyDD6Q-1 X-MC-Unique: edaPJklXOl2kPt0GA7-nBg-1 From: Hiroki Narukawa To: libvir-list@redhat.com Subject: [PATCH 5/5] qemu: add virtio-blk queue-size option Date: Thu, 9 Sep 2021 12:34:48 +0900 Message-Id: <20210909033448.7018-6-hnarukaw@yahoo-corp.jp> In-Reply-To: <20210909033448.7018-1-hnarukaw@yahoo-corp.jp> References: <20210909033448.7018-1-hnarukaw@yahoo-corp.jp> X-ClientProxiedBy: TYCPR01CA0024.jpnprd01.prod.outlook.com (2603:1096:405::36) To TY2PR01MB2010.jpnprd01.prod.outlook.com (2603:1096:404:10::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0d076d6c-13b6-45e7-8d05-08d97342daba X-MS-TrafficTypeDiagnostic: TYAPR01MB6283: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:23 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: oIGA+StSmDW0IgLfE1K7KpRjuw/MCy/GtA574mJTGCEISZbpkLEbpyq6c9bGXzG/DpMBHpMqZpmSUvpjYw3XyQiNK1m0Ri2Hgt2BKciaU4VyHswxdsYHp7NXERVxO4HjQFLlXSeveEsL7B3xiRhA+O1olRLZqsgfK32Glltgjoe2vw5oqBClwYdWlF3CVo04xeo133PdnPXw3lUNZIAtGYQ/s0qs6nOM9Za+PO8aIA+bDmb3zjTze7/qaCarzgC9He2Hb8sZWKGuGbkFv1gMORTi+tbT/yn+zQxFOrXTlT1Zsal83+TMjhbYbGFfnNxD4Usxi7cEUFh5gqqcMLHvQ2Y6TPnoK8QZrV4O1vzJqUswrhxfuwpZGWyzDHfT+fjTI/xEAX5KtdzOmErrtqzz4hpeOU2OmO2CFXbdHNVLwNin9icHqiWfg33Iw7RIjC5GHl6S8dBYY3VCKty90lSakcvhZw7UvYeOK76Zts3V1UsRzez0+ZoazSV/iMEcKSFr36d/AoJMUPXw5OE8Iw3L9UDRcP/QKVqj6jFPATGIPGGX+MhrOlO/REnvd6jufi/QKl2Wc/6QjGiFXI6Cy7A6wcGRHnpqcMMeeiFVuF1I1a2zSSCm721dabeOTBbsUWl+15qC9DbICAM/DVkvtulg9zu6cdmexYHvHcruWhi/4PL8OBbiUj/im74Shkex5gkxpzAq+tDyCrf85+ldDvAD/w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TY2PR01MB2010.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(376002)(346002)(39860400002)(396003)(366004)(6666004)(6506007)(2906002)(6916009)(4326008)(86362001)(26005)(36756003)(6512007)(2616005)(186003)(5660300002)(66946007)(8936002)(30864003)(956004)(316002)(38100700002)(66556008)(38350700002)(66476007)(52116002)(6486002)(107886003)(83380400001)(478600001)(1076003)(8676002); DIR:OUT; SFP:1102 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uT8/yz05ZYKFzeqi/oVTvVjvjP8WZuhWaMqIHE9E2oTH/W7lmHKH0+w4RD04?= =?us-ascii?Q?nXDEI4kRaXw3LyjeHYuE9dNFBKdCtIcpi/nVxhDXXOZ5omj+7SMOrF+0XQaa?= =?us-ascii?Q?f8wvLWzGg4nxm7vTX2AKtyFaR6BuX1kW5owtA445hgRMkW8ZCFjqHsvZ7X/0?= =?us-ascii?Q?3ZGW8e7gZpruU71HMGDG7cz3CkbgEKvcfUwncmGYvZ/lqs+qep85/eGYhDZ2?= =?us-ascii?Q?fKA8nHLxWZDXlk42qdggCq6/rBmiOzBSS7s6p9VffftRY4fzJM44CaC1CrI5?= =?us-ascii?Q?QnukSCePb9GHOU4JomYHPx6A0ZUv8o+fOMrG74HMxYyLZU9Gs3FxtsYIebYH?= =?us-ascii?Q?5v6IUrPrmxSToL7kVEDk48fpIeSbZJqCDe3rXuqaQCh+MOSSQcSCW6xClWzv?= =?us-ascii?Q?txg6F2TFcsQo1fJGez3XqKzIoHyQ4Bp4P9uakbreVAVJ1vI/Tz//MtTLLzoK?= =?us-ascii?Q?NAxLjth3HBu7NK7cMWQcBqA219yE4FRi2KG/l/gSAQA9W/nC37NQrkWKQlev?= =?us-ascii?Q?XBLb3oe2v2wOpRHdNEk0MmI2EJ0/aWFiM9Fll2k6ZXNJkHJ+lnymZTigXTSb?= =?us-ascii?Q?XHyw+Fp/NAFbi0MGTz9mJnlSoT6pvjpHMDbo28GFA8VdYZ9F6HZJ90e58Rlg?= =?us-ascii?Q?HYuPHVpImeVc24mKvugfcLVzpwncIxFM5DhYE1+bapf6NgkDuUweq1xsIjgZ?= =?us-ascii?Q?7J5ORacX6CiiQiw5CKe8hfAyPXNAbbygOfbz4FGJOBL7gHeenRWcwFwLiAY1?= =?us-ascii?Q?nrJSwdWrM72k4Xos7/fcTgzCkSebEBBkaT13djXxNfsqEfdhl/RXYTce5UXE?= =?us-ascii?Q?+pfaJXiC0xwRDwWe3uRIMrjIHQNlRHTzlF2e2fbxus+1YEmo/eYgN17+4h4+?= =?us-ascii?Q?hylON8LeKsFR/66c/j2Z2hHpspEm4LtUEt7X94WGWZEK+HG1fSGK906PofhZ?= =?us-ascii?Q?e+em0ODuQUdBIAghjTGnGB0sMMcijBoBHiFNz20pKgFyl1Q03l2F3bCaRL8A?= =?us-ascii?Q?8irAkeiJnI4fpbdh8D5Fpg/q8psa/4IVeSvRs3ny2VFU/1DNC3/1jjfnKMLB?= =?us-ascii?Q?JUX6JCh0bWP0xvHDSDPnIWjLN0zRDWNNmzMmSvbVjqTv5GQxru8EoYH4g8Gn?= =?us-ascii?Q?xTkD3FvK+vFo8/gDt2yeh+9eRJuXN2O0kHvulq5jo2UMqLKvO1jL/RF8sYoX?= =?us-ascii?Q?y3OaXnehZRk13aSGfGdgEvtG61wLN/2AZ5NOekM+OnWrRhqrJozqlSdqnhDe?= =?us-ascii?Q?ruFwlCJrHjwZYb425xJsJRZNbgKpebmx29qZXVBESqgoWigd72MNAC/pUAFQ?= =?us-ascii?Q?TeBMLmpISx1vrmgf1VfxzRu8?= X-OriginatorOrg: yahoo-corp.jp X-MS-Exchange-CrossTenant-Network-Message-Id: 0d076d6c-13b6-45e7-8d05-08d97342daba X-MS-Exchange-CrossTenant-AuthSource: TY2PR01MB2010.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2021 03:35:22.6039 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a208d369-cd4e-4f87-b119-98eaf31df2c3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: WFn1dWViaxOEZ+41fjTFv8OYA8UE25vanuFdoiUsxEtbqaeSINwA+kfv1DtKywtNKr6YYF+QLrGGY+hxhq+sJw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYAPR01MB6283 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.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: aoiwa@yahoo-corp.jp, Hiroki Narukawa 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 X-ZM-MESSAGEID: 1631158565122100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The option "queue-size" in virtio-blk was added in qemu-2.12.0, and default= value increased from qemu-5.0.0. However, increasing this value may lead to drop of random access performanc= e. This is configurable value, so we want to use it via libvirt. Signed-off-by: Hiroki Narukawa Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 3 ++ src/qemu/qemu_validate.c | 7 ++++ .../disk-virtio-queue-size.args | 35 +++++++++++++++++ .../disk-virtio-queue-size.x86_64-latest.args | 35 +++++++++++++++++ .../disk-virtio-queue-size.xml | 38 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../disk-virtio-queue-size.x86_64-latest.xml | 38 +++++++++++++++++++ .../disk-virtio-queue-size.xml | 35 +++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 9 files changed, 193 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-virtio-queue-size.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-queue-size.x86_64-la= test.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-queue-size.xml create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-queue-size.x86_64-= latest.xml create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-queue-size.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b230314f7f..f0319d2234 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1738,6 +1738,9 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, if (disk->queues) { virBufferAsprintf(&opt, ",num-queues=3D%u", disk->queues); } + if (disk->queue_size > 0) { + virBufferAsprintf(&opt, ",queue-size=3D%u", disk->queue_size); + } =20 qemuBuildVirtioOptionsStr(&opt, disk->virtio); =20 diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 1a470f1ff5..16ccf2e76d 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2823,6 +2823,13 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDom= ainDiskDef *disk, "QEMU binary")); return -1; } + if (disk->queue_size && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("queue-size property isn't supported by this " + "QEMU binary")); + return -1; + } break; =20 case VIR_DOMAIN_DISK_BUS_USB: diff --git a/tests/qemuxml2argvdata/disk-virtio-queue-size.args b/tests/qem= uxml2argvdata/disk-virtio-queue-size.args new file mode 100644 index 0000000000..2985e1726c --- /dev/null +++ b/tests/qemuxml2argvdata/disk-virtio-queue-size.args @@ -0,0 +1,35 @@ +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":"/tm= p/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 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":"file","filename":"/tmp/data.img","node-name":"libvir= t-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,queue-size=3D4,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvi= rt-1-format,id=3Dvirtio-disk0,bootindex=3D1 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio-queue-size.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/disk-virtio-queue-size.x86_64-latest.args new file mode 100644 index 0000000000..2985e1726c --- /dev/null +++ b/tests/qemuxml2argvdata/disk-virtio-queue-size.x86_64-latest.args @@ -0,0 +1,35 @@ +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":"/tm= p/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 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":"file","filename":"/tmp/data.img","node-name":"libvir= t-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,queue-size=3D4,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvi= rt-1-format,id=3Dvirtio-disk0,bootindex=3D1 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio-queue-size.xml b/tests/qemu= xml2argvdata/disk-virtio-queue-size.xml new file mode 100644 index 0000000000..1cd3f830e5 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-virtio-queue-size.xml @@ -0,0 +1,38 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + qemu64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-i386 + + + + +
+ + +
+ + +
+ + + + +