From nobody Tue Apr 30 16:01:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1588831103; cv=none; d=zohomail.com; s=zohoarc; b=e76jIWqGR/wbh50UHTDDOsXMo9d1Wmq9cd2codXSu4xjtaJS+SnQfJsvO4zV56TytJ4Xxn+lplKW/YPAiAaYpkNaPmgqeZ+G7cKJU3eWbqVs5FGvWW+c/d3Nc/dNSHvrndF1wP84Exo3bVRRdEgfOrwKhn8GfsqgBpbb62ojXOk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588831103; 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=LNT4vQvFEhaV9PIHEbWa3P7waCnA6QXGr7oavqT7GNw=; b=L8q+zRpa/RnKaq1PxthqR955zCMM+uTKoPEUi4i4f7xrhXRHgL4UA6mVLT1uvnw2OirvEVFTO5r4xNp0rYAyzJ/HsVqaPM5c85lwT5VrdV87XUe5gmYwvNU4XovhNcSWukZndy58gnvd0pNVMFzHW+J7Uc2orENnJpvK11l5SYY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1588831103256976.1980418283515; Wed, 6 May 2020 22:58:23 -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-376-4QlRluS_O5C6yOqXC0axrw-1; Thu, 07 May 2020 01:58:19 -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 03D37100CCC0; Thu, 7 May 2020 05:58:14 +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 EAE1460BEC; Thu, 7 May 2020 05:58:12 +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 6C4714CAA7; Thu, 7 May 2020 05:58:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0475w9IK015371 for ; Thu, 7 May 2020 01:58:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 285875D9DA; Thu, 7 May 2020 05:58:09 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E7E15D9C5 for ; Thu, 7 May 2020 05:58:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588831101; 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=LNT4vQvFEhaV9PIHEbWa3P7waCnA6QXGr7oavqT7GNw=; b=Nsrqpji9Vn968LU5rT5eYt/EarviKjqKUIBk/OUKvcezo1VA+KWWMB5ahjqdWBiZyYzEvM SmTl4tW9ENUgiFGI4EwRb1Fj6vqHJW52PrFLM2i9aNEoDmfruwoXr1XNJadUqe900GSN7j Wj7AfoEgChgVu+Vul++7JRgkH5aqnXM= X-MC-Unique: 4QlRluS_O5C6yOqXC0axrw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/8] virQEMUCapsProbeQMPDevices: Split up into logical chunks Date: Thu, 7 May 2020 07:57:56 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The function was parsing 'qom-list-types' and then also calling function which parses 'device-list-properties' and also 'qom-list-properties'. Split it up into individual functions. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_capabilities.c | 51 ++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2c6e36685e..dadbef32a2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2586,9 +2586,10 @@ virQEMUCapsProbeQMPGenericProps(virQEMUCapsPtr qemuC= aps, return 0; } + static int -virQEMUCapsProbeQMPDevices(virQEMUCapsPtr qemuCaps, - qemuMonitorPtr mon) +virQEMUCapsProbeQMPObjectTypes(virQEMUCapsPtr qemuCaps, + qemuMonitorPtr mon) { int nvalues; char **values; @@ -2601,22 +2602,34 @@ virQEMUCapsProbeQMPDevices(virQEMUCapsPtr qemuCaps, nvalues, values); virStringListFreeCount(values, nvalues); - if (virQEMUCapsProbeQMPGenericProps(qemuCaps, - mon, - virQEMUCapsDeviceProps, - G_N_ELEMENTS(virQEMUCapsDeviceProp= s), - qemuMonitorGetDeviceProps) < 0) - return -1; + return 0; +} - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QOM_LIST_PROPERTIES) && - virQEMUCapsProbeQMPGenericProps(qemuCaps, - mon, - virQEMUCapsObjectProps, - G_N_ELEMENTS(virQEMUCapsObjectProp= s), - qemuMonitorGetObjectProps) < 0) - return -1; - return 0; +static int +virQEMUCapsProbeQMPDeviceProperties(virQEMUCapsPtr qemuCaps, + qemuMonitorPtr mon) +{ + return virQEMUCapsProbeQMPGenericProps(qemuCaps, + mon, + virQEMUCapsDeviceProps, + G_N_ELEMENTS(virQEMUCapsDeviceP= rops), + qemuMonitorGetDeviceProps); +} + + +static int +virQEMUCapsProbeQMPObjectProperties(virQEMUCapsPtr qemuCaps, + qemuMonitorPtr mon) +{ + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QOM_LIST_PROPERTIES)) + return 0; + + return virQEMUCapsProbeQMPGenericProps(qemuCaps, + mon, + virQEMUCapsObjectProps, + G_N_ELEMENTS(virQEMUCapsObjectP= rops), + qemuMonitorGetObjectProps); } @@ -5061,7 +5074,11 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, if (virQEMUCapsProbeQMPEvents(qemuCaps, mon) < 0) return -1; - if (virQEMUCapsProbeQMPDevices(qemuCaps, mon) < 0) + if (virQEMUCapsProbeQMPObjectTypes(qemuCaps, mon) < 0) + return -1; + if (virQEMUCapsProbeQMPDeviceProperties(qemuCaps, mon) < 0) + return -1; + if (virQEMUCapsProbeQMPObjectProperties(qemuCaps, mon) < 0) return -1; if (virQEMUCapsProbeQMPMachineTypes(qemuCaps, type, mon) < 0) return -1; --=20 2.26.2 From nobody Tue Apr 30 16:01:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1588831118; cv=none; d=zohomail.com; s=zohoarc; b=R3poGkX8baY6tp8MaqaJjAJ3KA2qPe3mviCSEUNJY/0502m56Y61o9V/sMYsVSWQJc7Qxo0vveHJ5AXZFHFGGSkY2o+9hxklqno5TSsFcV5oOrNfsRf889MqzRQroZNAQrNS+ccE8lm/iDslu+u5ZvWO1/EcmoNemwr88G8rcv0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588831118; 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=osZWYGL3PI/rgcLR2rT8GmaHpLTm1ZZ7+JGdiyyzI1E=; b=mtz1Vj7FRTRFIaY9ggzoDTZvEFWAFnEaXyAparkAqqzobSLTyJG/YHfZsMEpr7UCX17hzn9WiG3kH43VvkedlhM6qQtjV4CUJACd4MchmCebzjwkJ3f2uO1I3A5h4kcSgPrpyYMvaWPmDljLCvdg8KtuusCrDEe5bzQ3FTY+QEw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1588831118125705.6514389977804; Wed, 6 May 2020 22:58:38 -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-418-DqAIbcvxMYSi4Y3_AJs4Zg-1; Thu, 07 May 2020 01:58:34 -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 8F89B835B44; Thu, 7 May 2020 05:58:29 +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 693AB5D9DC; Thu, 7 May 2020 05:58:29 +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 291A11809540; Thu, 7 May 2020 05:58:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0475wAp5015379 for ; Thu, 7 May 2020 01:58:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 17A925D9DA; Thu, 7 May 2020 05:58:10 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 883065D9C5 for ; Thu, 7 May 2020 05:58:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588831116; 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=osZWYGL3PI/rgcLR2rT8GmaHpLTm1ZZ7+JGdiyyzI1E=; b=feLO5n6lXnoY1tnWIwwjNFSaCEOdiys7IM8B5YCNZfHEkIP47y22Z2O3Q64OJIT+F6ylUM eJARxCGKFa794meAESyoYNzujp+eVzlkSRXY8wnR66dtC7zemF/xeBZuJF0UnrMPm4YL5y JA5kF607aRiJ2CyQsW9o3MmTetJkyV8= X-MC-Unique: DqAIbcvxMYSi4Y3_AJs4Zg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/8] virQEMUCapsProbeQMPDeviceProperties: Switch to local implementation Date: Thu, 7 May 2020 07:57:57 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Reimplement device property detection directly rather than using virQEMUCapsProbeQMPGenericProps in preparation for changes to the detection code. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_capabilities.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index dadbef32a2..5e72dead45 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2610,11 +2610,27 @@ static int virQEMUCapsProbeQMPDeviceProperties(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon) { - return virQEMUCapsProbeQMPGenericProps(qemuCaps, - mon, - virQEMUCapsDeviceProps, - G_N_ELEMENTS(virQEMUCapsDeviceP= rops), - qemuMonitorGetDeviceProps); + size_t i; + + for (i =3D 0; i < G_N_ELEMENTS(virQEMUCapsDeviceProps); i++) { + virQEMUCapsObjectTypeProps *device =3D virQEMUCapsDeviceProps + i; + VIR_AUTOSTRINGLIST values =3D NULL; + int nvalues; + + if (device->capsCondition >=3D 0 && + !virQEMUCapsGet(qemuCaps, device->capsCondition)) + continue; + + if ((nvalues =3D qemuMonitorGetDeviceProps(mon, device->type, &val= ues)) < 0) + return -1; + + virQEMUCapsProcessStringFlags(qemuCaps, + device->nprops, + device->props, + nvalues, values); + } + + return 0; } --=20 2.26.2 From nobody Tue Apr 30 16:01:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1588831104; cv=none; d=zohomail.com; s=zohoarc; b=LyGxmbhHnH+/rB21kpkbK/1BJAr67H/30EldI1QUEYl3KksJXBXg+Mh1s+Qnv+VfErN1sRAmg1zPwfW6FQpg6n6HK15+Ry5C9+ZWtcTLIGYxC60NvkQ9TJSzeCsi6l86qKP7qFRqEf4wH30mfHYsRfoPZpn/1SM8nY6OZ2aGjkw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588831104; 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=hZcH7DJCGuTCobKrpyBbbxAKonH+qh4BrIGgQv7z6zk=; b=Ws4s1VKcsTKmIB4LP7Zvg9d1z+JrFGMlUtfvV+z4RYpVr9+rsE6GiGt0u3kynHw4tuIZwc9fe06mWdL55AKJfP5bkJN/VyEkpKpmA/diA2mGwOUjd366uHJVDGTlBoTLd59l20k35Bjkst/sqdpaj3Y1FLi2Iwpc+W/WSh72eUk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1588831104739592.3970275890774; Wed, 6 May 2020 22:58:24 -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-182-OD2glJG1PSGfON6-dyIWRg-1; Thu, 07 May 2020 01:58:19 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3B6A21895A2B; Thu, 7 May 2020 05:58:14 +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 0B938707AE; Thu, 7 May 2020 05:58:14 +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 3764C1809542; Thu, 7 May 2020 05:58:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0475wBEb015387 for ; Thu, 7 May 2020 01:58:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 21A045D9DA; Thu, 7 May 2020 05:58:11 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7991B5D9C5 for ; Thu, 7 May 2020 05:58:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588831103; 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=hZcH7DJCGuTCobKrpyBbbxAKonH+qh4BrIGgQv7z6zk=; b=SSOpjSUyn8q6UjND1gExn4UZs3+ExGUWFVAj6U5FfLUxV8M40I4q8hfdAMqDNLcg1zXNsc 3VI6GwWglXAVLkKFmvv3ufJzHd4Y7MDp9RtTnXbtcHc0vYMzZFYabU7TdzbBTn3s1lFndF V//nQeVPScI+yd95xMowg58tJr4XQCQ= X-MC-Unique: OD2glJG1PSGfON6-dyIWRg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/8] virQEMUCapsProbeQMPObjectTypes: Fold in virQEMUCapsProbeQMPGenericProps Date: Thu, 7 May 2020 07:57:58 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" virQEMUCapsProbeQMPGenericProps is used only in one place now. Move the code directly to virQEMUCapsProbeQMPObjectTypes. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_capabilities.c | 60 +++++++++++++----------------------- 1 file changed, 21 insertions(+), 39 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5e72dead45..42425fabbd 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1483,10 +1483,6 @@ struct _virQEMUCapsObjectTypeProps { int capsCondition; }; -typedef int (*virQEMUCapsObjectTypePropsCB)(qemuMonitorPtr mon, - const char *type, - char ***props); - static virQEMUCapsObjectTypeProps virQEMUCapsDeviceProps[] =3D { { "virtio-blk-pci", virQEMUCapsDevicePropsVirtioBlk, G_N_ELEMENTS(virQEMUCapsDevicePropsVirtioBlk), @@ -2556,36 +2552,6 @@ virQEMUCapsProbeQMPEvents(virQEMUCapsPtr qemuCaps, return 0; } -static int -virQEMUCapsProbeQMPGenericProps(virQEMUCapsPtr qemuCaps, - qemuMonitorPtr mon, - virQEMUCapsObjectTypeProps *props, - size_t nprops, - virQEMUCapsObjectTypePropsCB propsGetCB) -{ - int nvalues; - char **values; - size_t i; - - for (i =3D 0; i < nprops; i++) { - const char *type =3D props[i].type; - int cap =3D props[i].capsCondition; - - if (cap >=3D 0 && !virQEMUCapsGet(qemuCaps, cap)) - continue; - - if ((nvalues =3D propsGetCB(mon, type, &values)) < 0) - return -1; - virQEMUCapsProcessStringFlags(qemuCaps, - props[i].nprops, - props[i].props, - nvalues, values); - virStringListFreeCount(values, nvalues); - } - - return 0; -} - static int virQEMUCapsProbeQMPObjectTypes(virQEMUCapsPtr qemuCaps, @@ -2638,14 +2604,30 @@ static int virQEMUCapsProbeQMPObjectProperties(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon) { + size_t i; + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QOM_LIST_PROPERTIES)) return 0; - return virQEMUCapsProbeQMPGenericProps(qemuCaps, - mon, - virQEMUCapsObjectProps, - G_N_ELEMENTS(virQEMUCapsObjectP= rops), - qemuMonitorGetObjectProps); + for (i =3D 0; i < G_N_ELEMENTS(virQEMUCapsObjectProps); i++) { + virQEMUCapsObjectTypeProps *props =3D virQEMUCapsObjectProps + i; + VIR_AUTOSTRINGLIST values =3D NULL; + int nvalues; + + if (props->capsCondition >=3D 0 && + !virQEMUCapsGet(qemuCaps, props->capsCondition)) + continue; + + if ((nvalues =3D qemuMonitorGetObjectProps(mon, props->type, &valu= es)) < 0) + return -1; + + virQEMUCapsProcessStringFlags(qemuCaps, + props->nprops, + props->props, + nvalues, values); + } + + return 0; } --=20 2.26.2 From nobody Tue Apr 30 16:01:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1588831120; cv=none; d=zohomail.com; s=zohoarc; b=DhXElj930I2leIYXJ99AJFNMcwARc6P456vqZJpZDfsJDNJCX7J2ZJTGiTPA06WWiTf1rWxglYV+jnRVJFYH6fA1PlE3m1rt9KtlMQsSnQkK/9whTYCtHo3liC7DIkkvPFuzCTK1hiJIIci6y9tc9Qx+CMBQ2H9r4yctHgez+to= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588831120; 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=lPo7wYfg1muhD4cRRYcEMFDmgF6saURg6q9K0wUPjHU=; b=i+ppAEwjvcCKgzOnxNNKGXZ6XtpYuerNMB76uCDZTKsILEvSBYtVaIH6+VelabNBorehsjeS3ae+en7Teqk7XRjcn8ez2CWCya9bU0A4W7zCZyG2rn+D+RhnexfKMvvkBgeb6h84Sf3JNqXd37G6oCAUQiZG9hmU7JVFh5TO2YQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1588831120639947.2622076362484; Wed, 6 May 2020 22:58:40 -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-424-_zFViZpbP9uA1PDJ_IMDZA-1; Thu, 07 May 2020 01:58:37 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B4A04100CCC0; Thu, 7 May 2020 05:58:31 +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 8F0DF5C28E; Thu, 7 May 2020 05:58:31 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4C47C1809557; Thu, 7 May 2020 05:58:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0475wCxD015398 for ; Thu, 7 May 2020 01:58:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 116165D9DA; Thu, 7 May 2020 05:58:12 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7820D5D9C5 for ; Thu, 7 May 2020 05:58:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588831119; 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=lPo7wYfg1muhD4cRRYcEMFDmgF6saURg6q9K0wUPjHU=; b=KInOgadeAQbYjm0BkQNKjNHXlzhNkLEGaAJyNU9YcmktYpdBurWtCiJ7dflgGjZivlkDf8 JfRsLQadTDUcKT1UoDa/McRqTCi91svi05YFlSQEEwQknwqKNvgnBhHRgbBdenoEokxwnQ hEgmRKxjIJASxqSargC0ALt7HCt1RZM= X-MC-Unique: _zFViZpbP9uA1PDJ_IMDZA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/8] qemuMonitorJSONGetDeviceProps: Refactor to modern standards Date: Thu, 7 May 2020 07:57:59 +0200 Message-Id: <452311bb8264fe912a37d35aeb887fdba746bfe3.1588830947.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Use automatic cleanup of variables and current style of header. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_monitor_json.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 619717eae5..9d1db07ccd 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6745,13 +6745,13 @@ qemuMonitorJSONParsePropsList(virJSONValuePtr cmd, } -int qemuMonitorJSONGetDeviceProps(qemuMonitorPtr mon, - const char *device, - char ***props) +int +qemuMonitorJSONGetDeviceProps(qemuMonitorPtr mon, + const char *device, + char ***props) { - int ret =3D -1; - virJSONValuePtr cmd; - virJSONValuePtr reply =3D NULL; + g_autoptr(virJSONValue) cmd =3D NULL; + g_autoptr(virJSONValue) reply =3D NULL; *props =3D NULL; @@ -6761,18 +6761,12 @@ int qemuMonitorJSONGetDeviceProps(qemuMonitorPtr mo= n, return -1; if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) - goto cleanup; + return -1; - if (qemuMonitorJSONHasError(reply, "DeviceNotFound")) { - ret =3D 0; - goto cleanup; - } + if (qemuMonitorJSONHasError(reply, "DeviceNotFound")) + return 0; - ret =3D qemuMonitorJSONParsePropsList(cmd, reply, NULL, props); - cleanup: - virJSONValueFree(reply); - virJSONValueFree(cmd); - return ret; + return qemuMonitorJSONParsePropsList(cmd, reply, NULL, props); } --=20 2.26.2 From nobody Tue Apr 30 16:01:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1588831118; cv=none; d=zohomail.com; s=zohoarc; b=J5uD5U02GSnLvTUHe68h0OcwEWhP5dAfGozsOq9YZ3na5Ulff64VuNCYjkSCjSFCauGOfS7e0I39Wk+/ryuyrdBKDd71Edh3vtgmm0xLS7RGgYNAmW2mtIxixHP0hbha8NP3/3pkoUYUpCHw2WVo/7SLPRdj4jUVm1CYLQOGB78= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588831118; 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=qQAHmaBcRrACWD9gO89KuSpgKZ/uzT1SsOasXG/7nRs=; b=ZOCKgiYiVbqvmx9I9n193L/0pFfi+SXDIrB4NzYQNu67DefQ8KmdsBtZrs80Sz2k6Y6Y9BV3jqT0fpi3At1inxxNvWGOBmbgeqSd1yPSL0Vi7OrqrCvcYRc1+/Op+oJ12l6/+fOp0Pr+K5UwpjasUFUf5guVrCxStKQiN0NvLb0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1588831118379461.59060626794997; Wed, 6 May 2020 22:58:38 -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-267-ORZ0DrROPKO9Rj_Bty9THA-1; Thu, 07 May 2020 01:58:34 -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 866C6464; Thu, 7 May 2020 05:58:29 +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 60BA063F61; Thu, 7 May 2020 05:58:29 +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 144E04CAA0; Thu, 7 May 2020 05:58:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0475wDuO015408 for ; Thu, 7 May 2020 01:58:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 020AE5D9DA; Thu, 7 May 2020 05:58:13 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7217F5D9C5 for ; Thu, 7 May 2020 05:58:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588831116; 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=qQAHmaBcRrACWD9gO89KuSpgKZ/uzT1SsOasXG/7nRs=; b=R9/RsOzd7ahHnUjgpnz9OIuQyeX33EGTDBKyHhYmzQVn75rrS90D+T+i+HwIckcL+IDgcM pa2U+7RhXaTeGBsn3CLl+MrQyOnPT5oq8QPMXRiVt7CZlysg8H9L3Oj+R/uFpF1pAJh2XG RdWcQsT+Q+mKudfwQq2KyDtHHodcOBA= X-MC-Unique: ORZ0DrROPKO9Rj_Bty9THA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 5/8] qemuMonitorGetDeviceProps: Return data in a hash table Date: Thu, 7 May 2020 07:58:00 +0200 Message-Id: <5d4cf574d3b3c4f4796a33fa49f17e8002aa4968.1588830947.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Create a hash table of device property names which also stores the corresponding JSON object so that the detection code can look at the recently added 'default-value' field and possibly others. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_capabilities.c | 18 ++++++++------ src/qemu/qemu_monitor.c | 11 ++++----- src/qemu/qemu_monitor.h | 5 ++-- src/qemu/qemu_monitor_json.c | 46 +++++++++++++++++++++++++++++------- src/qemu/qemu_monitor_json.h | 7 +++--- 5 files changed, 58 insertions(+), 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 42425fabbd..ae1f0853f1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2580,20 +2580,24 @@ virQEMUCapsProbeQMPDeviceProperties(virQEMUCapsPtr = qemuCaps, for (i =3D 0; i < G_N_ELEMENTS(virQEMUCapsDeviceProps); i++) { virQEMUCapsObjectTypeProps *device =3D virQEMUCapsDeviceProps + i; - VIR_AUTOSTRINGLIST values =3D NULL; - int nvalues; + g_autoptr(virHashTable) qemuprops =3D NULL; + size_t j; if (device->capsCondition >=3D 0 && !virQEMUCapsGet(qemuCaps, device->capsCondition)) continue; - if ((nvalues =3D qemuMonitorGetDeviceProps(mon, device->type, &val= ues)) < 0) + if (!(qemuprops =3D qemuMonitorGetDeviceProps(mon, device->type))) return -1; - virQEMUCapsProcessStringFlags(qemuCaps, - device->nprops, - device->props, - nvalues, values); + for (j =3D 0; j < device->nprops; j++) { + virJSONValuePtr entry =3D virHashLookup(qemuprops, device->pro= ps[j].value); + + if (!entry) + continue; + + virQEMUCapsSet(qemuCaps, device->props[j].flag); + } } return 0; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 339facfad3..9c853ccb93 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3764,16 +3764,15 @@ qemuMonitorGetObjectTypes(qemuMonitorPtr mon, } -int +virHashTablePtr qemuMonitorGetDeviceProps(qemuMonitorPtr mon, - const char *device, - char ***props) + const char *device) { - VIR_DEBUG("device=3D%s props=3D%p", device, props); + VIR_DEBUG("device=3D%s", device); - QEMU_CHECK_MONITOR(mon); + QEMU_CHECK_MONITOR_NULL(mon); - return qemuMonitorJSONGetDeviceProps(mon, device, props); + return qemuMonitorJSONGetDeviceProps(mon, device); } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 68e21dcaee..2e35d94bda 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1203,9 +1203,8 @@ int qemuMonitorGetKVMState(qemuMonitorPtr mon, int qemuMonitorGetObjectTypes(qemuMonitorPtr mon, char ***types); -int qemuMonitorGetDeviceProps(qemuMonitorPtr mon, - const char *device, - char ***props); +virHashTablePtr qemuMonitorGetDeviceProps(qemuMonitorPtr mon, + const char *device); int qemuMonitorGetObjectProps(qemuMonitorPtr mon, const char *object, char ***props); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 9d1db07ccd..505b31a78a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6745,28 +6745,56 @@ qemuMonitorJSONParsePropsList(virJSONValuePtr cmd, } -int +static int +qemuMonitorJSONGetDevicePropsWorker(size_t pos G_GNUC_UNUSED, + virJSONValuePtr item, + void *opaque) +{ + const char *name =3D virJSONValueObjectGetString(item, "name"); + virHashTablePtr devices =3D opaque; + + if (!name) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("reply data was missing 'name'")); + return -1; + } + + if (virHashAddEntry(devices, name, item) < 0) + return -1; + + return 0; +} + + +virHashTablePtr qemuMonitorJSONGetDeviceProps(qemuMonitorPtr mon, - const char *device, - char ***props) + const char *device) { + g_autoptr(virHashTable) props =3D virHashNew(virJSONValueHashFree); g_autoptr(virJSONValue) cmd =3D NULL; g_autoptr(virJSONValue) reply =3D NULL; - *props =3D NULL; - if (!(cmd =3D qemuMonitorJSONMakeCommand("device-list-properties", "s:typename", device, NULL))) - return -1; + return NULL; if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) - return -1; + return NULL; + /* return empty hash */ if (qemuMonitorJSONHasError(reply, "DeviceNotFound")) - return 0; + return g_steal_pointer(&props); + + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) + return NULL; + + if (virJSONValueArrayForeachSteal(virJSONValueObjectGetArray(reply, "r= eturn"), + qemuMonitorJSONGetDevicePropsWorker, + props) < 0) + return NULL; - return qemuMonitorJSONParsePropsList(cmd, reply, NULL, props); + return g_steal_pointer(&props); } diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 05a46b4fe2..d3d46ec2f7 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -487,10 +487,9 @@ int qemuMonitorJSONSetObjectProperty(qemuMonitorPtr mo= n, qemuMonitorJSONObjectPropertyPtr prop) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); -int qemuMonitorJSONGetDeviceProps(qemuMonitorPtr mon, - const char *device, - char ***props) - ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); +virHashTablePtr qemuMonitorJSONGetDeviceProps(qemuMonitorPtr mon, + const char *device) + ATTRIBUTE_NONNULL(2); int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon, const char *object, char ***props) --=20 2.26.2 From nobody Tue Apr 30 16:01:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1588831124; cv=none; d=zohomail.com; s=zohoarc; b=bsGsVAVgFWFmKzcI0Tm+H3FeumHlgndxzXRwpsGBg3GzxupTXqS2JVwZ+Uxjram2bL1m7B0x7RNumnBLpKgjjdh+IH7ZtQfyG87ktJQRO4beqgHPyGys6o4o5D7eKyNbJyer45EtKQIRV9TyAbl8D8fCo5SpIDJjA8EAQ8Y7/ho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588831124; 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=8ys+tF8T1f/jr7ZdvLhv2AQgt6UBB5eu28GUQTWYiOI=; b=ghl8syocNEjubGPOQslVC6F6Gtuoptz+oBPwSCthfMzb02SMEPI3NAGo1hGs3+IA6d+CkwfsCzlFm84+9pu0gAd6DXlfZbX6bID2IMTQjElSG/GPLKezcs0qrw5xqIvHcgLx3v0ZfRd9exLsNS12Z5m1Ipw7K/kyj5XZcYQpw9I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 158883112436845.53157022968253; Wed, 6 May 2020 22:58:44 -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-207-KUgetgfJMkCI5TvLCVAXAQ-1; Thu, 07 May 2020 01:58:38 -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 3B3771895A33; Thu, 7 May 2020 05:58:33 +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 11E545D9DC; Thu, 7 May 2020 05:58:33 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C0F434CAAE; Thu, 7 May 2020 05:58:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0475wEK0015414 for ; Thu, 7 May 2020 01:58:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1B2025D9DA; Thu, 7 May 2020 05:58:14 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5869F5D9C5 for ; Thu, 7 May 2020 05:58:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588831123; 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=8ys+tF8T1f/jr7ZdvLhv2AQgt6UBB5eu28GUQTWYiOI=; b=a5z4+5F9xGrxd8l3OAMcbF0k+H31dp/LEeaqtMoEd/LyRFMQvKQ0gRvn7A04uOd7xczFkq JbJN6tBD2GUx665yLUgnlPYTdcBdA+YbCMTPb1tut7BY4X90ao4rkUZ8DJZGh6E9y3BO4c CWsVf0pG9wWCF825JUc7bOlXkwKNidU= X-MC-Unique: KUgetgfJMkCI5TvLCVAXAQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 6/8] virQEMUCapsProbeQMPDeviceProperties: Add per-property callbacks Date: Thu, 7 May 2020 07:58:01 +0200 Message-Id: <2ecc28d2fb0568cc8fb07377237ed5be9da03336.1588830947.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" QEMU-5.0 added 'default-value' field for any applicable property returned by 'device-list-properties'. Add an optional callback for any device property definition which will allow detection of features and default values based on this new data. This unfortunately means that the description of properties had to move from the slightly-too-generic 'struct virQEMUCapsStringFlags' to a new type (virQEMUCapsDevicePropsFlags) which also has the callback property and the corresponding change in the initializers. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_capabilities.c | 226 +++++++++++++++++++---------------- 1 file changed, 124 insertions(+), 102 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ae1f0853f1..94a1e5e3b8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1303,154 +1303,162 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTy= pes[] =3D { { "tcg-accel", QEMU_CAPS_TCG }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[]= =3D { - { "deflate-on-oom", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE }, - { "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY }, - { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM }, - { "ats", QEMU_CAPS_VIRTIO_PCI_ATS }, - { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES }, + +struct virQEMUCapsDevicePropsFlags { + const char *value; + int flag; + int (*cb)(virJSONValuePtr props, virQEMUCapsPtr caps); +}; + + +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBall= oon[] =3D { + { "deflate-on-oom", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, NULL }, + { "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, NULL }, + { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, NULL }, + { "ats", QEMU_CAPS_VIRTIO_PCI_ATS, NULL }, + { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBlk[] =3D= { - { "ioeventfd", QEMU_CAPS_VIRTIO_IOEVENTFD }, - { "event_idx", QEMU_CAPS_VIRTIO_BLK_EVENT_IDX }, - { "scsi", QEMU_CAPS_VIRTIO_BLK_SCSI }, - { "logical_block_size", QEMU_CAPS_BLOCKIO }, - { "num-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES }, - { "share-rw", QEMU_CAPS_DISK_SHARE_RW }, - { "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY }, - { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM }, - { "ats", QEMU_CAPS_VIRTIO_PCI_ATS }, - { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE }, - { "werror", QEMU_CAPS_STORAGE_WERROR }, - { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[= ] =3D { + { "ioeventfd", QEMU_CAPS_VIRTIO_IOEVENTFD, NULL }, + { "event_idx", QEMU_CAPS_VIRTIO_BLK_EVENT_IDX, NULL }, + { "scsi", QEMU_CAPS_VIRTIO_BLK_SCSI, NULL }, + { "logical_block_size", QEMU_CAPS_BLOCKIO, NULL }, + { "num-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, 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 }, + { "ats", QEMU_CAPS_VIRTIO_PCI_ATS, NULL }, + { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, + { "werror", QEMU_CAPS_STORAGE_WERROR, NULL }, + { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioNet[] =3D= { - { "tx", QEMU_CAPS_VIRTIO_TX_ALG }, - { "event_idx", QEMU_CAPS_VIRTIO_NET_EVENT_IDX }, - { "rx_queue_size", QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE }, - { "tx_queue_size", QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE }, - { "host_mtu", QEMU_CAPS_VIRTIO_NET_HOST_MTU }, - { "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY }, - { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM }, - { "ats", QEMU_CAPS_VIRTIO_PCI_ATS }, - { "failover", QEMU_CAPS_VIRTIO_NET_FAILOVER }, - { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioNet[= ] =3D { + { "tx", QEMU_CAPS_VIRTIO_TX_ALG, NULL }, + { "event_idx", QEMU_CAPS_VIRTIO_NET_EVENT_IDX, NULL }, + { "rx_queue_size", QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, NULL }, + { "tx_queue_size", QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, NULL }, + { "host_mtu", QEMU_CAPS_VIRTIO_NET_HOST_MTU, NULL }, + { "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, NULL }, + { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, NULL }, + { "ats", QEMU_CAPS_VIRTIO_PCI_ATS, NULL }, + { "failover", QEMU_CAPS_VIRTIO_NET_FAILOVER, NULL }, + { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsPCIeRootPort[] = =3D { - { "hotplug", QEMU_CAPS_PCIE_ROOT_PORT_HOTPLUG }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsPCIeRootPo= rt[] =3D { + { "hotplug", QEMU_CAPS_PCIE_ROOT_PORT_HOTPLUG, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsSpaprPCIHostBri= dge[] =3D { - { "numa_node", QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSpaprPCIHo= stBridge[] =3D { + { "numa_node", QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioSCSI[] = =3D { - { "iothread", QEMU_CAPS_VIRTIO_SCSI_IOTHREAD }, - { "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY }, - { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM }, - { "ats", QEMU_CAPS_VIRTIO_PCI_ATS }, - { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioSCSI= [] =3D { + { "iothread", QEMU_CAPS_VIRTIO_SCSI_IOTHREAD, NULL }, + { "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, NULL }, + { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, NULL }, + { "ats", QEMU_CAPS_VIRTIO_PCI_ATS, NULL }, + { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVfioPCI[] =3D { - { "display", QEMU_CAPS_VFIO_PCI_DISPLAY }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVfioPCI[] = =3D { + { "display", QEMU_CAPS_VFIO_PCI_DISPLAY, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsSCSIDisk[] =3D { - { "channel", QEMU_CAPS_SCSI_DISK_CHANNEL }, - { "wwn", QEMU_CAPS_SCSI_DISK_WWN }, - { "share-rw", QEMU_CAPS_DISK_SHARE_RW }, - { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE }, - { "device_id", QEMU_CAPS_SCSI_DISK_DEVICE_ID }, - { "werror", QEMU_CAPS_STORAGE_WERROR }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIDisk[]= =3D { + { "channel", QEMU_CAPS_SCSI_DISK_CHANNEL, NULL }, + { "wwn", QEMU_CAPS_SCSI_DISK_WWN, NULL }, + { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL }, + { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, + { "device_id", QEMU_CAPS_SCSI_DISK_DEVICE_ID, NULL }, + { "werror", QEMU_CAPS_STORAGE_WERROR, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsIDEDrive[] =3D { - { "wwn", QEMU_CAPS_IDE_DRIVE_WWN }, - { "share-rw", QEMU_CAPS_DISK_SHARE_RW }, - { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIDEDrive[]= =3D { + { "wwn", QEMU_CAPS_IDE_DRIVE_WWN, NULL }, + { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL }, + { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsPiix4PM[] =3D { - { "disable_s3", QEMU_CAPS_PIIX_DISABLE_S3 }, - { "disable_s4", QEMU_CAPS_PIIX_DISABLE_S4 }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsPiix4PM[] = =3D { + { "disable_s3", QEMU_CAPS_PIIX_DISABLE_S3, NULL }, + { "disable_s4", QEMU_CAPS_PIIX_DISABLE_S4, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBRedir[] =3D { - { "filter", QEMU_CAPS_USB_REDIR_FILTER }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBRedir[]= =3D { + { "filter", QEMU_CAPS_USB_REDIR_FILTER, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsI440FXPCIHost[]= =3D { - { "pci-hole64-size", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsI440FXPCIH= ost[] =3D { + { "pci-hole64-size", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsQ35PCIHost[] = =3D { - { "pci-hole64-size", QEMU_CAPS_Q35_PCI_HOLE64_SIZE }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsQ35PCIHost= [] =3D { + { "pci-hole64-size", QEMU_CAPS_Q35_PCI_HOLE64_SIZE, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBStorage[] = =3D { - { "removable", QEMU_CAPS_USB_STORAGE_REMOVABLE }, - { "share-rw", QEMU_CAPS_DISK_SHARE_RW }, - { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE }, - { "werror", QEMU_CAPS_USB_STORAGE_WERROR }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBStorage= [] =3D { + { "removable", QEMU_CAPS_USB_STORAGE_REMOVABLE, NULL }, + { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL }, + { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, + { "werror", QEMU_CAPS_USB_STORAGE_WERROR, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsKVMPit[] =3D { - { "lost_tick_policy", QEMU_CAPS_KVM_PIT_TICK_POLICY }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsKVMPit[] = =3D { + { "lost_tick_policy", QEMU_CAPS_KVM_PIT_TICK_POLICY, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVGA[] =3D { - { "vgamem_mb", QEMU_CAPS_VGA_VGAMEM }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVGA[] =3D { + { "vgamem_mb", QEMU_CAPS_VGA_VGAMEM, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVmwareSvga[] = =3D { - { "vgamem_mb", QEMU_CAPS_VMWARE_SVGA_VGAMEM }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVmwareSvga= [] =3D { + { "vgamem_mb", QEMU_CAPS_VMWARE_SVGA_VGAMEM, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsQxl[] =3D { - { "vgamem_mb", QEMU_CAPS_QXL_VGAMEM }, - { "vram64_size_mb", QEMU_CAPS_QXL_VRAM64 }, - { "max_outputs", QEMU_CAPS_QXL_MAX_OUTPUTS }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsQxl[] =3D { + { "vgamem_mb", QEMU_CAPS_QXL_VGAMEM, NULL }, + { "vram64_size_mb", QEMU_CAPS_QXL_VRAM64, NULL }, + { "max_outputs", QEMU_CAPS_QXL_MAX_OUTPUTS, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioGpu[] =3D= { - { "virgl", QEMU_CAPS_VIRTIO_GPU_VIRGL }, - { "max_outputs", QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS }, - { "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY }, - { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM }, - { "ats", QEMU_CAPS_VIRTIO_PCI_ATS }, - { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioGpu[= ] =3D { + { "virgl", QEMU_CAPS_VIRTIO_GPU_VIRGL, NULL }, + { "max_outputs", QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS, NULL }, + { "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, NULL }, + { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, NULL }, + { "ats", QEMU_CAPS_VIRTIO_PCI_ATS, NULL }, + { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsICH9[] =3D { - { "disable_s3", QEMU_CAPS_ICH9_DISABLE_S3 }, - { "disable_s4", QEMU_CAPS_ICH9_DISABLE_S4 }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsICH9[] =3D= { + { "disable_s3", QEMU_CAPS_ICH9_DISABLE_S3, NULL }, + { "disable_s4", QEMU_CAPS_ICH9_DISABLE_S4, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBNECXHCI[] = =3D { - { "p3", QEMU_CAPS_NEC_USB_XHCI_PORTS }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBNECXHCI= [] =3D { + { "p3", QEMU_CAPS_NEC_USB_XHCI_PORTS, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsIntelIOMMU[] = =3D { - { "intremap", QEMU_CAPS_INTEL_IOMMU_INTREMAP }, - { "caching-mode", QEMU_CAPS_INTEL_IOMMU_CACHING_MODE }, - { "eim", QEMU_CAPS_INTEL_IOMMU_EIM }, - { "device-iotlb", QEMU_CAPS_INTEL_IOMMU_DEVICE_IOTLB }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIntelIOMMU= [] =3D { + { "intremap", QEMU_CAPS_INTEL_IOMMU_INTREMAP, NULL }, + { "caching-mode", QEMU_CAPS_INTEL_IOMMU_CACHING_MODE, NULL }, + { "eim", QEMU_CAPS_INTEL_IOMMU_EIM, NULL }, + { "device-iotlb", QEMU_CAPS_INTEL_IOMMU_DEVICE_IOTLB, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtualCSSBridg= e[] =3D { - { "cssid-unrestricted", QEMU_CAPS_CCW_CSSID_UNRESTRICTED }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsObjectPropsVirtualCSS= Bridge[] =3D { + { "cssid-unrestricted", QEMU_CAPS_CCW_CSSID_UNRESTRICTED, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsMCH[] =3D { - { "extended-tseg-mbytes", QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsMCH[] =3D { + { "extended-tseg-mbytes", QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES, NULL }, }; -static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsNVDIMM[] =3D { - { "unarmed", QEMU_CAPS_DEVICE_NVDIMM_UNARMED }, +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsNVDIMM[] = =3D { + { "unarmed", QEMU_CAPS_DEVICE_NVDIMM_UNARMED, NULL }, }; /* see documentation for virQEMUQAPISchemaPathGet for the query format */ @@ -1483,7 +1491,17 @@ struct _virQEMUCapsObjectTypeProps { int capsCondition; }; -static virQEMUCapsObjectTypeProps virQEMUCapsDeviceProps[] =3D { + +typedef struct _virQEMUCapsDeviceTypeProps virQEMUCapsDeviceTypeProps; +struct _virQEMUCapsDeviceTypeProps { + const char *type; + struct virQEMUCapsDevicePropsFlags *props; + size_t nprops; + int capsCondition; +}; + + +static virQEMUCapsDeviceTypeProps virQEMUCapsDeviceProps[] =3D { { "virtio-blk-pci", virQEMUCapsDevicePropsVirtioBlk, G_N_ELEMENTS(virQEMUCapsDevicePropsVirtioBlk), -1 }, @@ -2579,7 +2597,7 @@ virQEMUCapsProbeQMPDeviceProperties(virQEMUCapsPtr qe= muCaps, size_t i; for (i =3D 0; i < G_N_ELEMENTS(virQEMUCapsDeviceProps); i++) { - virQEMUCapsObjectTypeProps *device =3D virQEMUCapsDeviceProps + i; + virQEMUCapsDeviceTypeProps *device =3D virQEMUCapsDeviceProps + i; g_autoptr(virHashTable) qemuprops =3D NULL; size_t j; @@ -2597,6 +2615,10 @@ virQEMUCapsProbeQMPDeviceProperties(virQEMUCapsPtr q= emuCaps, continue; virQEMUCapsSet(qemuCaps, device->props[j].flag); + + if (device->props[j].cb && + device->props[j].cb(entry, qemuCaps) < 0) + return -1; } } --=20 2.26.2 From nobody Tue Apr 30 16:01:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1588831122; cv=none; d=zohomail.com; s=zohoarc; b=D5ASnKiMeOjLaqktBeMWCuDmjMUOWXG/RERB0XpyX4Ye7UP7Z5gRPdVPeUirMOzKKXZ/3Bm++cCpwTA74+WCYwpUjRCJKlsyrbHJ4O3BVibhsxczAQfXVls8G5SxMIUtbyWnmRoaKO+r6Xvvg660i2tUUr6XCp8wnqiHPbtHcpA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588831122; 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=ObDgqySDpvmCYh38mUrstDoPtisdHuJ8eC9zxkRW+tU=; b=VonrtN5Sxg+/NSRh5B8jzyjmqbqsC+OGKt4BoiEgK6+r/7gJz1KTivDUGVWhjiAdyfsK9ND1WB60O58S/t3es2PCwG2i3SB/xYMqiS3N4KLvjsJMd9tM7+WJfoybtKia5jLn9CojGeJyXNOUDV8/2brJhRp7AVsoxBwg2QUURoE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1588831122811456.4623412883533; Wed, 6 May 2020 22:58:42 -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-205-nkZRiFIpNj6RjBkAX6hvBg-1; Thu, 07 May 2020 01:58:38 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 128B37BB3; Thu, 7 May 2020 05:58:33 +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 DA3352E044; Thu, 7 May 2020 05:58:32 +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 92C964CAB0; Thu, 7 May 2020 05:58:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0475wFbc015423 for ; Thu, 7 May 2020 01:58:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 140985D9DA; Thu, 7 May 2020 05:58:15 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B1445D9C5 for ; Thu, 7 May 2020 05:58:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588831121; 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=ObDgqySDpvmCYh38mUrstDoPtisdHuJ8eC9zxkRW+tU=; b=Hr8ZB1wzxITHxeeErSuhb7WZlYyD0YIsYpNkJeRctwBcy4vWUkP+hjR9iN4Jt0w+zkJet0 vCnEP5Bk9U2x450qV7il/we4fh1I6ysMn108HRpRoq+c/J1hUU7cISZUsKeFiqGcJmdRhj 7CZuKycf7nwj6mTEgtVrif1K3QG0qR8= X-MC-Unique: nkZRiFIpNj6RjBkAX6hvBg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 7/8] qemu: capabilities: Introduce QEMU_CAPS_VIRTIO_BLK_SCSI_DEFAULT_DISABLED Date: Thu, 7 May 2020 07:58:02 +0200 Message-Id: <9c1f1d715a73e84773f862c5823daa915a738584.1588830947.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Historically the 'scsi' passthrough feature of virtio-blk-pci was enabled by default. Libvirt was disabling it due to security implications outlined in libvirt commit v0.9.9-4-g177db08775 if it was not explicitly requested. In qemu commit v2.4.0-1566-ged65fd1a27 the default value was changed to disabled in preparation for virtio-1. Starting from QEMU-5.0 the 'scsi' property was also deprecated. There replacement for the functionality is to use 'virtio-scsi' for the purpose. This isn't a direct replacement though. Add capability named QEMU_CAPS_VIRTIO_BLK_SCSI_DEFAULT_DISABLED which allows us to stop formatting the 'scsi=3D' property if it's disabled by default and not requested so that we don't use deprecated features. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_capabilities.c | 20 ++++++++++++++++++- src/qemu/qemu_capabilities.h | 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 + .../caps_5.1.0.x86_64.xml | 1 + 7 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 94a1e5e3b8..0e7db2643a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -580,6 +580,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "machine.pseries.cap-sbbc", "machine.pseries.cap-ibs", "tcg", + "virtio-blk-pci.scsi.default.disabled", ); @@ -1319,10 +1320,27 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCa= psDevicePropsVirtioBalloon[] { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL }, }; + +static int +virQEMUCapsDevicePropsVirtioBlkSCSIDefault(virJSONValuePtr props, + virQEMUCapsPtr qemuCaps) +{ + bool def =3D false; + + if (virJSONValueObjectGetBoolean(props, "default-value", &def) < 0) + return 0; + + if (def =3D=3D false) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_SCSI_DEFAULT_DISABLE= D); + + return 0; +} + + static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[= ] =3D { { "ioeventfd", QEMU_CAPS_VIRTIO_IOEVENTFD, NULL }, { "event_idx", QEMU_CAPS_VIRTIO_BLK_EVENT_IDX, NULL }, - { "scsi", QEMU_CAPS_VIRTIO_BLK_SCSI, NULL }, + { "scsi", QEMU_CAPS_VIRTIO_BLK_SCSI, virQEMUCapsDevicePropsVirtioBlkSC= SIDefault }, { "logical_block_size", QEMU_CAPS_BLOCKIO, NULL }, { "num-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, NULL }, { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index cdeaf09cce..db8bebe3df 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -561,6 +561,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC, /* -machine pseries.cap-sbbc */ QEMU_CAPS_MACHINE_PSERIES_CAP_IBS, /* -machine pseries.cap-ibs */ QEMU_CAPS_TCG, /* QEMU does support TCG */ + QEMU_CAPS_VIRTIO_BLK_SCSI_DEFAULT_DISABLED, /* virtio-blk-pci.scsi dis= abled by default */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index 1f743aaa11..618ad8ee14 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -191,6 +191,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 a5f0bb538b..0f5dce9264 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -199,6 +199,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 e9651ca581..bc6a27e87e 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -187,6 +187,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 f127f38bcc..ed4c08e99e 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -232,6 +232,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 9611549bd7..f7018daa84 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -232,6 +232,7 @@ + 5000050 0 43100242 --=20 2.26.2 From nobody Tue Apr 30 16:01:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1588831145; cv=none; d=zohomail.com; s=zohoarc; b=YVNGJombC6O9s33Qog/EVxv6IvQCV3W/AoNB6KHBDyn4bYoUC0+KLfjDfgUacByLbHCqCoJhUz1zvxyAX9r5jQedNxLSCT8FMwdwGfXhuaOy/6+1MX//yrlKDhcpds2pDalWk7lWo5BCVV2faVAIPRoTlpHgkPmlIodYxj1IPP8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588831145; 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=BLlNp7uYKU4auAHahoHAht/DXwfM5VmnA/VBUge81WU=; b=cs6XghkZ/O+/T/ZngEuP2+FXsbyTjQlSsa+Ld+RyAbLevHzf4/0S4eyYNwbKvQPUHJdAZe/NlteTiePpjvTJQlfIPYgTEiMigxBNfA9SVT6EbdklZp37pYO1nQCJF5ogWLQKOuwhemRClRDY/KLzFtXwlA5F1ln5xuAT3XwLSDw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1588831145049287.7769491589697; Wed, 6 May 2020 22:59:05 -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-278-RkCETFtxP2SJ0q1-of7iIg-1; Thu, 07 May 2020 01:58:41 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6CA808018A6; Thu, 7 May 2020 05:58:36 +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 4429E707AA; Thu, 7 May 2020 05:58:36 +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 F3CFD1809561; Thu, 7 May 2020 05:58:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0475wGZg015441 for ; Thu, 7 May 2020 01:58:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2F9495D9DA; Thu, 7 May 2020 05:58:16 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 755AF5D9C5 for ; Thu, 7 May 2020 05:58:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588831143; 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=BLlNp7uYKU4auAHahoHAht/DXwfM5VmnA/VBUge81WU=; b=iblY8n6f7QJHVfYVQA7ve4LrBcAdaJYJ5zp5+G/Sq1/tvN69efNfinJIyJ6TlXdtb2plhP gpE1nZQtnp20CgDk4WAzE7qpHc5FD5l+KMVeeSAkgVs47qgFwGin7S5c421CrH0RKthzSK 1vF3DXEs+fyryUXDsLQIBDggCWqdq8Y= X-MC-Unique: RkCETFtxP2SJ0q1-of7iIg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 8/8] qemu: command: Stop formatting of 'scsi=off' for virtio-blk-pci Date: Thu, 7 May 2020 07:58:03 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The property was deprecated. Don't format it based on the new capability if the user didn't explicitly request it. https://bugzilla.redhat.com/show_bug.cgi?id=3D1829550 Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 4 +++- ...ch64-default-cpu-kvm-virt-4.2.aarch64-latest.args | 2 +- ...ch64-default-cpu-tcg-virt-4.2.aarch64-latest.args | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 2 +- .../aarch64-virt-headless.aarch64-latest.args | 2 +- .../disk-aio-io_uring.x86_64-latest.args | 2 +- .../disk-backing-chains-noindex.x86_64-latest.args | 12 ++++++------ tests/qemuxml2argvdata/disk-cache.x86_64-latest.args | 2 +- .../disk-cdrom-tray.x86_64-latest.args | 2 +- .../disk-copy_on_read.x86_64-latest.args | 2 +- .../disk-detect-zeroes.x86_64-latest.args | 2 +- .../disk-network-gluster.x86_64-latest.args | 6 +++--- .../disk-network-http.x86_64-latest.args | 8 ++++---- .../disk-network-iscsi.x86_64-latest.args | 8 ++++---- .../disk-network-nbd.x86_64-latest.args | 10 +++++----- .../disk-network-rbd.x86_64-latest.args | 12 ++++++------ .../disk-network-sheepdog.x86_64-latest.args | 2 +- .../disk-network-source-auth.x86_64-latest.args | 4 ++-- .../disk-network-tlsx509.x86_64-latest.args | 8 ++++---- tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args | 8 ++++---- .../qemuxml2argvdata/disk-shared.x86_64-latest.args | 4 ++-- .../qemuxml2argvdata/disk-slices.x86_64-latest.args | 6 +++--- .../iothreads-virtio-scsi-pci.x86_64-latest.args | 2 +- .../luks-disks-source-qcow2.x86_64-latest.args | 12 ++++++------ ...c64-default-cpu-kvm-pseries-2.7.ppc64-latest.args | 2 +- ...c64-default-cpu-kvm-pseries-3.1.ppc64-latest.args | 2 +- ...c64-default-cpu-kvm-pseries-4.2.ppc64-latest.args | 2 +- ...c64-default-cpu-tcg-pseries-2.7.ppc64-latest.args | 2 +- ...c64-default-cpu-tcg-pseries-3.1.ppc64-latest.args | 2 +- ...c64-default-cpu-tcg-pseries-4.2.ppc64-latest.args | 2 +- .../ppc64-pseries-graphics.ppc64-latest.args | 2 +- .../ppc64-pseries-headless.ppc64-latest.args | 2 +- .../riscv64-virt-graphics.riscv64-latest.args | 2 +- .../riscv64-virt-headless.riscv64-latest.args | 2 +- .../vhost-user-fs-hugepages.x86_64-latest.args | 2 +- .../virtio-non-transitional.x86_64-latest.args | 2 +- .../virtio-options-disk-ats.x86_64-latest.args | 8 ++++---- .../virtio-options-disk-iommu.x86_64-latest.args | 4 ++-- .../virtio-options-disk-packed.x86_64-latest.args | 8 ++++---- .../virtio-options.x86_64-latest.args | 4 ++-- .../virtio-transitional.x86_64-latest.args | 4 ++-- .../x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args | 2 +- ...x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args | 2 +- .../x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args | 2 +- ...x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args | 2 +- .../x86_64-pc-graphics.x86_64-latest.args | 2 +- .../x86_64-pc-headless.x86_64-latest.args | 2 +- .../x86_64-q35-graphics.x86_64-latest.args | 2 +- .../x86_64-q35-headless.x86_64-latest.args | 2 +- 49 files changed, 97 insertions(+), 95 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 269bdbaf56..31fc0b4340 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2113,7 +2113,9 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virBufferAsprintf(&opt, ",event_idx=3D%s", virTristateSwitchTypeToString(disk->event_id= x)); } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_SCSI)) { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_SCSI) && + !(virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_SCSI_DEFAULT_D= ISABLED) && + disk->device !=3D VIR_DOMAIN_DISK_DEVICE_LUN)) { /* if sg_io is true but the scsi option isn't supported, * that means it's just always on in this version of qemu. */ diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch6= 4-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aar= ch64-latest.args index e8da16897f..8cb202a2c9 100644 --- a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-lates= t.args +++ b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-lates= t.args @@ -33,7 +33,7 @@ addr=3D0x1 \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.1,addr=3D0x0,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x0,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch6= 4-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aar= ch64-latest.args index 1b41743107..7518afb17d 100644 --- a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-lates= t.args +++ b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-lates= t.args @@ -34,7 +34,7 @@ addr=3D0x1 \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.1,addr=3D0x0,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x0,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args index 058c528e8a..468f207925 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args @@ -52,7 +52,7 @@ addr=3D0x1 \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:53:45:a5= ,bus=3Dpci.1,\ diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args index ddd0518bd5..7101100fd0 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args @@ -52,7 +52,7 @@ addr=3D0x1 \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.1,\ diff --git a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args index 0bcf8f5aff..8596639f60 100644 --- a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args @@ -33,7 +33,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x9,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x9,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-late= st.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.= args index 6c19da970f..6e01f55577 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args @@ -37,7 +37,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "node-name":"libvirt-24-storage","auto-read-only":true,"discard":"unmap"}'= \ -blockdev '{"node-name":"libvirt-24-format","read-only":false,"driver":"qc= ow2",\ "file":"libvirt-24-storage","backing":"libvirt-25-format"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-2= 4-format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-24-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-KDE.iso= ",\ "node-name":"libvirt-23-storage","auto-read-only":true,"discard":"unmap"}'= \ @@ -68,14 +68,14 @@ id=3Dvirtio-disk0,bootindex=3D1 \ "discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-17-format","read-only":false,"driver":"qc= ow2",\ "file":"libvirt-17-storage","backing":"libvirt-18-format"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-1= 7-format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-17-format,\ id=3Dvirtio-disk1 \ -blockdev '{"driver":"gluster","volume":"Volume1","path":"Image",\ "server":[{"type":"inet","host":"example.org","port":"6000"}],"debug":4,\ "node-name":"libvirt-16-storage","auto-read-only":true,"discard":"unmap"}'= \ -blockdev '{"node-name":"libvirt-16-format","read-only":false,"driver":"ra= w",\ "file":"libvirt-16-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1= 6-format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-16-format,\ id=3Dvirtio-disk2 \ -blockdev '{"driver":"file","filename":"/tmp/image.qcow",\ "node-name":"libvirt-15-storage","auto-read-only":true,"discard":"unmap"}'= \ @@ -92,13 +92,13 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,fo= rmat=3Dbase64 \ "node-name":"libvirt-14-storage","auto-read-only":true,"discard":"unmap"}'= \ -blockdev '{"node-name":"libvirt-14-format","read-only":false,"driver":"qc= ow2",\ "file":"libvirt-14-storage","backing":"libvirt-15-format"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-1= 4-format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-14-format,\ id=3Dvirtio-disk3 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest11",\ "node-name":"libvirt-13-storage","auto-read-only":true,"discard":"unmap"}'= \ -blockdev '{"node-name":"libvirt-13-format","read-only":false,"driver":"qc= ow2",\ "file":"libvirt-13-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-1= 3-format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-13-format,\ id=3Dvirtio-disk4 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/rhel7.qcow= 2",\ "node-name":"libvirt-12-storage","auto-read-only":true,"discard":"unmap"}'= \ @@ -159,7 +159,7 @@ id=3Dvirtio-disk4 \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage","backing":"libvirt-2-format"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk5 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x8 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args b/tests/q= emuxml2argvdata/disk-cache.x86_64-latest.args index 4b70cb634c..931e344028 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args @@ -59,7 +59,7 @@ drive=3Dlibvirt-3-format,id=3Dscsi0-0-0,write-cache=3Don \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,\ "cache":{"direct":false,"no-flush":false},"driver":"qcow2",\ "file":"libvirt-2-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-2= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-2-format,\ id=3Dvirtio-disk0,write-cache=3Doff \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ "node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},\ diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args b/te= sts/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args index 120aa5b53b..3e56168acb 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args @@ -32,7 +32,7 @@ file=3D/tmp/lib/domain--1-test/master-key.aes \ "node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-3-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-3= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-3-format,\ id=3Dvirtio-disk0,bootindex=3D2 \ -blockdev '{"driver":"file",\ "filename":"/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso",\ diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args index 82d44ba0bb..701038404d 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args @@ -35,7 +35,7 @@ file=3D/tmp/lib/domain--1-test/master-key.aes \ "file":"libvirt-2-storage"}' \ -blockdev '{"driver":"copy-on-read","node-name":"libvirt-CoR-vda",\ "file":"libvirt-2-format"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-C= oR-vda,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-CoR-vda,\ id=3Dvirtio-disk0,bootindex=3D2 \ -blockdev '{"driver":"file",\ "filename":"/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso",\ diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args index 1a6a02a3be..8e8d92a6f7 100644 --- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args @@ -32,7 +32,7 @@ file=3D/tmp/lib/domain--1-test/master-key.aes \ "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"discard":"un= map",\ "detect-zeroes":"unmap","driver":"qcow2","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-2= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-2-format,\ id=3Dvirtio-disk0,bootindex=3D2 \ -blockdev '{"driver":"file",\ "filename":"/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso",\ diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args index 2cd59992ca..4e68f1b628 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args @@ -33,14 +33,14 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-3= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-3-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"gluster","volume":"Volume2","path":"Image",\ "server":[{"type":"unix","path":"/path/to/sock"}],"debug":4,\ "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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-2= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-2-format,\ id=3Dvirtio-disk1 \ -blockdev '{"driver":"gluster","volume":"Volume3","path":"Image.qcow2",\ "server":[{"type":"inet","host":"example.org","port":"6000"},{"type":"inet= ",\ @@ -49,7 +49,7 @@ id=3Dvirtio-disk1 \ "discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args index 7b4674a588..814f747dad 100644 --- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args @@ -33,14 +33,14 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ",\ "file":"libvirt-4-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-4= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-4-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"https","url":"https://example.org:443/test2.img",\ "readahead":1024,"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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-3= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-3-format,\ id=3Dvirtio-disk1 \ -object secret,id=3Dlibvirt-2-storage-httpcookie-secret0,\ data=3DDrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA,\ @@ -50,7 +50,7 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ "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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-2= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-2-format,\ id=3Dvirtio-disk2 \ -object secret,id=3Dlibvirt-1-storage-httpcookie-secret0,\ data=3DDrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA,\ @@ -61,7 +61,7 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ "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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args index 3f61f6dc2c..9848128092 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args @@ -34,14 +34,14 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ",\ "file":"libvirt-5-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-5= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-5-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"iscsi","portal":"example.org:6000",\ "target":"iqn.1992-01.com.example","lun":1,"transport":"tcp",\ "node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ",\ "file":"libvirt-4-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-4= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-4-format,\ id=3Dvirtio-disk1 \ -object secret,id=3Dlibvirt-3-storage-auth-secret0,\ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ @@ -52,7 +52,7 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ "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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-3= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-3-format,\ id=3Dvirtio-disk2 \ -object secret,id=3Dlibvirt-2-storage-auth-secret0,\ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ @@ -63,7 +63,7 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ "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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2-format,\ id=3Dvirtio-disk3 \ -blockdev '{"driver":"iscsi","portal":"example.org:3260",\ "target":"iqn.1992-01.com.example","lun":0,"transport":"tcp",\ diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args index 5453440ac8..8c9bbed130 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args @@ -33,34 +33,34 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ",\ "file":"libvirt-5-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-5= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-5-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org",\ "port":"6000"},"export":"bar","node-name":"libvirt-4-storage",\ "auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ",\ "file":"libvirt-4-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-4= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-4-format,\ id=3Dvirtio-disk1 \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"::1","port":"60= 00"},\ "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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-3= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-3-format,\ id=3Dvirtio-disk2 \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"::1","port":"60= 00"},\ "export":"bar","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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-2= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-2-format,\ id=3Dvirtio-disk3 \ -blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/run/nbdsoc= k"},\ "export":"bar","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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args index fb8fc988e8..29409df722 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args @@ -34,13 +34,13 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ",\ "file":"libvirt-6-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-6= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-6-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","snapshot":"asdf"= ,\ "node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ",\ "file":"libvirt-5-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-5= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-5-format,\ id=3Dvirtio-disk1 \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","snapshot":"foo",\ "server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.= org",\ @@ -48,14 +48,14 @@ id=3Dvirtio-disk1 \ "node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ",\ "file":"libvirt-4-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-4= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-4-format,\ id=3Dvirtio-disk2 \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","snapshot":"foo",\ "conf":"/blah/test.conf","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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-3= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-3-format,\ id=3Dvirtio-disk3 \ -object secret,id=3Dlibvirt-2-storage-auth-secret0,\ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ @@ -68,7 +68,7 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ "auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ",\ "file":"libvirt-2-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2-format,\ id=3Dvirtio-disk4 \ -blockdev '{"driver":"rbd","pool":"pool","image":"image",\ "server":[{"host":"::1","port":"6321"},{"host":"example.org","port":"6789"= },\ @@ -77,7 +77,7 @@ id=3Dvirtio-disk4 \ "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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk5 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.arg= s b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args index 302ec9b9fd..a5e197f45b 100644 --- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args @@ -38,7 +38,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "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,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.= args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args index 7a504d49be..0ad49ab0fd 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args @@ -37,7 +37,7 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ "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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-2= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-2-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -object secret,id=3Dlibvirt-1-storage-auth-secret0,\ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ @@ -50,7 +50,7 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ "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,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk1 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args index a2aeb91958..5195107b7b 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args @@ -38,7 +38,7 @@ dir=3D/etc/pki/libvirt-vxhs/dummy,,path,endpoint=3Dclient= ,verify-peer=3Dyes \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,\ "cache":{"direct":true,"no-flush":false},"driver":"raw",\ "file":"libvirt-4-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-4= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-4-format,\ id=3Dvirtio-disk0,bootindex=3D1,write-cache=3Don,\ serial=3Deb90327c-8302-4725-9e1b-4e85ed4dc251 \ -object tls-creds-x509,id=3Dobjlibvirt-3-storage_tls0,\ @@ -51,7 +51,7 @@ dir=3D/etc/pki/libvirt-vxhs/dummy,,path,endpoint=3Dclient= ,verify-peer=3Dyes \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,\ "cache":{"direct":true,"no-flush":false},"driver":"raw",\ "file":"libvirt-3-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-3= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-3-format,\ id=3Dvirtio-disk1,write-cache=3Don,serial=3Deb90327c-8302-4725-9e1b-4e85ed= 4dc252 \ -blockdev '{"driver":"vxhs","vdisk-id":"eb90327c-8302-4725-9e1b-4e85ed4dc2= 53",\ "server":{"host":"192.168.0.3","port":"9999"},"node-name":"libvirt-2-stora= ge",\ @@ -60,7 +60,7 @@ id=3Dvirtio-disk1,write-cache=3Don,serial=3Deb90327c-8302= -4725-9e1b-4e85ed4dc252 \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,\ "cache":{"direct":true,"no-flush":false},"driver":"raw",\ "file":"libvirt-2-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2-format,\ id=3Dvirtio-disk2,write-cache=3Don,serial=3Deb90327c-8302-4725-9e1b-4e85ed= 4dc252 \ -object tls-creds-x509,id=3Dobjlibvirt-1-storage_tls0,\ dir=3D/etc/pki/libvirt-nbd/dummy,,path,endpoint=3Dclient,verify-peer=3Dyes= \ @@ -71,7 +71,7 @@ dir=3D/etc/pki/libvirt-nbd/dummy,,path,endpoint=3Dclient,= verify-peer=3Dyes \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,\ "cache":{"direct":true,"no-flush":false},"driver":"raw",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk3,write-cache=3Don \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args b/tests/qe= muxml2argvdata/disk-nvme.x86_64-latest.args index 5334882c0b..a0b5c5950c 100644 --- a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args @@ -33,19 +33,19 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ",\ "file":"libvirt-4-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-4= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-4-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"nvme","device":"0000:01:00.0","namespace":2,\ "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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-3= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-3-format,\ id=3Dvirtio-disk1 \ -blockdev '{"driver":"nvme","device":"0000:02:00.0","namespace":1,\ "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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2-format,\ id=3Dvirtio-disk2 \ -object secret,id=3Dlibvirt-1-format-encryption-secret0,\ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ @@ -57,7 +57,7 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ "cache":{"direct":true,"no-flush":false},"driver":"qcow2",\ "encrypt":{"format":"luks","key-secret":"libvirt-1-format-encryption-secre= t0"},\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk3,write-cache=3Don \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-shared.x86_64-latest.args index 224414e15c..4bae8ae5c9 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args @@ -57,8 +57,8 @@ write-cache=3Don \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,\ "cache":{"direct":true,"no-flush":false},"driver":"raw",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,share-rw=3Don,\ -drive=3Dlibvirt-1-format,id=3Dvirtio-disk0,write-cache=3Don \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,share-rw=3Don,drive=3Dlibvir= t-1-format,\ +id=3Dvirtio-disk0,write-cache=3Don \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-slices.x86_64-latest.args index 869b4c0af0..cd2f5847c4 100644 --- a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args @@ -32,7 +32,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ",\ "offset":1234,"size":321,"file":"libvirt-4-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-4= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-4-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/raw.img",\ "node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ @@ -45,7 +45,7 @@ id=3Dvirtio-disk0,bootindex=3D1 \ "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-2-storage","backing":"libvirt-3-format"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-2= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-2-format,\ id=3Dvirtio-disk1 \ -object secret,id=3Dlibvirt-1-format-encryption-secret0,\ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ @@ -58,7 +58,7 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"luk= s",\ "key-secret":"libvirt-1-format-encryption-secret0",\ "file":"libvirt-1-slice-sto"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest= .args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args index c366520e09..d00867a09b 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args @@ -41,7 +41,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "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 virtio-blk-pci,iothread=3Diothread1,scsi=3Doff,bus=3Dpci.0,addr=3D= 0x4,\ +-device virtio-blk-pci,iothread=3Diothread1,bus=3Dpci.0,addr=3D0x4,\ drive=3Dlibvirt-2-format,id=3Dvirtio-disk1 \ -blockdev '{"driver":"file",\ "filename":"/var/lib/libvirt/images/iothrtest2.img",\ diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args index 44e4c5698d..3ce9f81006 100644 --- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args @@ -36,7 +36,7 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ -blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"qco= w2",\ "encrypt":{"format":"luks","key-secret":"libvirt-7-format-encryption-secre= t0"},\ "file":"libvirt-7-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-7= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-7-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -object secret,id=3Dlibvirt-6-format-encryption-secret0,\ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ @@ -46,7 +46,7 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"qco= w2",\ "encrypt":{"format":"luks","key-secret":"libvirt-6-format-encryption-secre= t0"},\ "file":"libvirt-6-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-6= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-6-format,\ id=3Dvirtio-disk1 \ -object secret,id=3Dlibvirt-5-storage-auth-secret0,\ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ @@ -61,7 +61,7 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"qco= w2",\ "encrypt":{"format":"luks","key-secret":"libvirt-5-format-encryption-secre= t0"},\ "file":"libvirt-5-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-5= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-5-format,\ id=3Dvirtio-disk2 \ -object secret,id=3Dlibvirt-4-format-encryption-secret0,\ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ @@ -72,7 +72,7 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"qco= w2",\ "encrypt":{"format":"luks","key-secret":"libvirt-4-format-encryption-secre= t0"},\ "file":"libvirt-4-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-4= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-4-format,\ id=3Dvirtio-disk3 \ -object secret,id=3Dlibvirt-3-format-encryption-secret0,\ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ @@ -84,7 +84,7 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"qco= w2",\ "encrypt":{"format":"luks","key-secret":"libvirt-3-format-encryption-secre= t0"},\ "file":"libvirt-3-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-3= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-3-format,\ id=3Dvirtio-disk4 \ -object secret,id=3Dlibvirt-2-format-encryption-secret0,\ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ @@ -102,7 +102,7 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,fo= rmat=3Dbase64 \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "encrypt":{"format":"luks","key-secret":"libvirt-1-format-encryption-secre= t0"},\ "file":"libvirt-1-storage","backing":"libvirt-2-format"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x8,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x8,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk5 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc= 64-latest.args index 03c2aeb7fb..5c6d73b892 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest= .args @@ -31,7 +31,7 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ -device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc= 64-latest.args index 3827978c66..2c8649502d 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest= .args @@ -31,7 +31,7 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ -device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc= 64-latest.args index 5e9774e512..15ffbc9cd1 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest= .args @@ -31,7 +31,7 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ -device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc= 64-latest.args index ec00df93ca..79cfa679c5 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest= .args @@ -31,7 +31,7 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ -device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc= 64-latest.args index acba692b0d..2c451b4443 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest= .args @@ -31,7 +31,7 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ -device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc= 64-latest.args index 5727576c81..22e5f6ef73 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest= .args @@ -31,7 +31,7 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ -device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 \ diff --git a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.arg= s b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args index 2e0ba1e7f4..9aba7ec3cb 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args @@ -31,7 +31,7 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:a2:44:92= ,bus=3Dpci.0,\ diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.arg= s b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args index bcdbc8591b..bfca44faa9 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args @@ -32,7 +32,7 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.0,\ diff --git a/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.ar= gs b/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args index 6e0de34d6e..612e1ce049 100644 --- a/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args +++ b/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args @@ -39,7 +39,7 @@ addr=3D0x1 \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.1,\ diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.ar= gs b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args index 92a3021640..8485e3d0f8 100644 --- a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args +++ b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args @@ -39,7 +39,7 @@ addr=3D0x1 \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.1,\ diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args index 39190b8d3e..258fa7813f 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args @@ -38,7 +38,7 @@ addr=3D0x1 \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -chardev socket,id=3Dchr-vu-fs0,path=3D/tmp/lib/domain--1-guest/fs0.vhost-= fs.sock \ -device vhost-user-fs-pci,chardev=3Dchr-vu-fs0,tag=3Dmount_tag,bus=3Dpci.1= ,addr=3D0x0 \ diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args index 0d751ea7ae..1fe7901479 100644 --- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args @@ -47,7 +47,7 @@ addr=3D0x0 \ "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 virtio-blk-pci-non-transitional,scsi=3Doff,bus=3Dpci.5,addr=3D0x0,\ +-device virtio-blk-pci-non-transitional,bus=3Dpci.5,addr=3D0x0,\ drive=3Dlibvirt-1-format,id=3Dvirtio-disk0,bootindex=3D1 \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ -device virtio-9p-pci-non-transitional,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_ta= g=3Dfs1,\ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args index 4d940ce404..cf82457eb6 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args @@ -32,14 +32,14 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "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 virtio-blk-pci,scsi=3Doff,ats=3Don,bus=3Dpci.0,addr=3D0x2,\ -drive=3Dlibvirt-2-format,id=3Dvirtio-disk0,bootindex=3D1 \ +-device virtio-blk-pci,ats=3Don,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-2-f= ormat,\ +id=3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img2",\ "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 virtio-blk-pci,scsi=3Doff,ats=3Doff,bus=3Dpci.0,addr=3D0x3,\ -drive=3Dlibvirt-1-format,id=3Dvirtio-disk1 \ +-device virtio-blk-pci,ats=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-1-= format,\ +id=3Dvirtio-disk1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest= .args b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args index e580eeae72..70a5ee13a1 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args @@ -32,13 +32,13 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "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 virtio-blk-pci,scsi=3Doff,iommu_platform=3Don,bus=3Dpci.0,addr=3D0= x2,\ +-device virtio-blk-pci,iommu_platform=3Don,bus=3Dpci.0,addr=3D0x2,\ drive=3Dlibvirt-2-format,id=3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img2",\ "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 virtio-blk-pci,scsi=3Doff,iommu_platform=3Doff,bus=3Dpci.0,addr=3D= 0x3,\ +-device virtio-blk-pci,iommu_platform=3Doff,bus=3Dpci.0,addr=3D0x3,\ drive=3Dlibvirt-1-format,id=3Dvirtio-disk1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-lates= t.args b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.ar= gs index 9d8b7e1692..09ac4d559b 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args @@ -32,14 +32,14 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "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 virtio-blk-pci,scsi=3Doff,packed=3Don,bus=3Dpci.0,addr=3D0x2,\ -drive=3Dlibvirt-2-format,id=3Dvirtio-disk0,bootindex=3D1 \ +-device virtio-blk-pci,packed=3Don,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-= 2-format,\ +id=3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img2",\ "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 virtio-blk-pci,scsi=3Doff,packed=3Doff,bus=3Dpci.0,addr=3D0x3,\ -drive=3Dlibvirt-1-format,id=3Dvirtio-disk1 \ +-device virtio-blk-pci,packed=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt= -1-format,\ +id=3Dvirtio-disk1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args b/tes= ts/qemuxml2argvdata/virtio-options.x86_64-latest.args index e523f73fee..66bbd7df64 100644 --- a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args @@ -36,8 +36,8 @@ bus=3Dpci.0,addr=3D0x9 \ "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 virtio-blk-pci,scsi=3Doff,iommu_platform=3Don,ats=3Don,packed=3Don= ,bus=3Dpci.0,\ -addr=3D0xa,drive=3Dlibvirt-1-format,id=3Dvirtio-disk0,bootindex=3D1 \ +-device virtio-blk-pci,iommu_platform=3Don,ats=3Don,packed=3Don,bus=3Dpci.= 0,addr=3D0xa,\ +drive=3Dlibvirt-1-format,id=3Dvirtio-disk0,bootindex=3D1 \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ -device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3Dfs1,iommu_pla= tform=3Don,\ ats=3Don,packed=3Don,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args index 0bd0da05d0..01cb9f8308 100644 --- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args @@ -37,8 +37,8 @@ addr=3D0x1 \ "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 virtio-blk-pci-transitional,scsi=3Doff,bus=3Dpci.2,addr=3D0x5,\ -drive=3Dlibvirt-1-format,id=3Dvirtio-disk0,bootindex=3D1 \ +-device virtio-blk-pci-transitional,bus=3Dpci.2,addr=3D0x5,drive=3Dlibvirt= -1-format,\ +id=3Dvirtio-disk0,bootindex=3D1 \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ -device virtio-9p-pci-transitional,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3D= fs1,\ bus=3Dpci.2,addr=3D0x1 \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-la= test.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-lat= est.args index 74715f9517..3d9f246000 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.ar= gs @@ -31,7 +31,7 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-l= atest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-l= atest.args index 145864b896..1066522ed5 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.a= rgs @@ -36,7 +36,7 @@ addr=3D0x1 \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.2,addr=3D0x0,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x0,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.3,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-la= test.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-lat= est.args index 21d5b358bc..e547001eb5 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.ar= gs @@ -31,7 +31,7 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-l= atest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-l= atest.args index 9afac1778b..6549f6251e 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.a= rgs @@ -36,7 +36,7 @@ addr=3D0x1 \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.2,addr=3D0x0,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x0,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.3,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ diff --git a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args b= /tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args index b6c06961d7..4049ee6b27 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args @@ -35,7 +35,7 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:4c:e3:86= ,bus=3Dpci.0,\ diff --git a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args b= /tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args index 0fa7134198..47887c0c18 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args @@ -36,7 +36,7 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.0,\ diff --git a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args = b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args index 5a6fbe65df..6425325a5b 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args @@ -43,7 +43,7 @@ multifunction=3Don,addr=3D0x2 \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:d2:70:0b= ,bus=3Dpci.1,\ diff --git a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args = b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args index 8a8728e59c..63254b500c 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args @@ -44,7 +44,7 @@ addr=3D0x1 \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1= -format,\ +-device virtio-blk-pci,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.1,\ --=20 2.26.2