From nobody Sat Feb 7 08:42:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1661430437; cv=none; d=zohomail.com; s=zohoarc; b=dUJFSWjGD1hAmLPuhWYl+LpM1tgf/Q1PK1s6HH5w8RxZcNriPatQs+rPs5kpQdGrH9OxXfLQ9iEXLHET4saW7pw4+U7WKb/9RghA11OiB33F3WVdlHrfz0KqeWGgoCVYtIo2dFM74JztVyq9713QQ5IfowrU3igtbgy83TqRzaE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661430437; 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=2Qx01WsFFZCIp4yobfi2lFj9ePU23zdy0GOUtH237Tw=; b=X5pLA4qmjWprGsz56ET3kjeSG/k7m27qcG7YuplLTy/meclj1PX6KFhKw/Qd3u+LuOclq09OfEJXRacQJ1DXeOYLiD2cOSoCZPMjVR0A3q/BInv+BY9WClQsflEw5tyhmVrGjztrswVRMkS6YUtnzl7mHA7c1r29wcHlDLeHn9Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1661430437551466.3864334748423; Thu, 25 Aug 2022 05:27:17 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-17--8ripw2PPaeB4_LBNsL-Ug-1; Thu, 25 Aug 2022 08:27:11 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7105918E5396; Thu, 25 Aug 2022 12:27:05 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id AEED8141510F; Thu, 25 Aug 2022 12:27:04 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 906261946A5A; Thu, 25 Aug 2022 12:27:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E9FCE1946A43 for ; Thu, 25 Aug 2022 12:27:03 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id BDE58492CA6; Thu, 25 Aug 2022 12:27:03 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 397B3492C3B for ; Thu, 25 Aug 2022 12:27:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661430435; 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=2Qx01WsFFZCIp4yobfi2lFj9ePU23zdy0GOUtH237Tw=; b=AYeTielyXhbYcO5FTvbkIx3TnsCKeSGaS79y5teYaOUmdHIwLlbvHNlZP2dpMopy8CyvZH Rox1AbI3ykUj9VjYTZsBKTcdRUXQswPR2RV/Q0ctdLSZ1UHCEzRb82emjM8FNW34pdXP2T UKEZu/+u8KC6GrfNZuU8R5E9mPDWkGc= X-MC-Unique: -8ripw2PPaeB4_LBNsL-Ug-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/3] qemuxml2argvtest: Use different network storage protocol for boot order tests Date: Thu, 25 Aug 2022 14:26:59 +0200 Message-Id: <45a4a9aa5ecc94fb3c87bc473e973d3c74f2ecf4.1661430370.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1661430438392100005 Content-Type: text/plain; charset="utf-8" The support for 'sheepdog' was dropped from qemu-6.1 and later, to convert the tests to latest caps we need to use something else. Use 'nbd'. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuxml2argvdata/boot-dev+order.xml | 2 +- tests/qemuxml2argvdata/boot-order.args | 2 +- tests/qemuxml2argvdata/boot-order.xml | 2 +- tests/qemuxml2xmloutdata/boot-order.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/qemuxml2argvdata/boot-dev+order.xml b/tests/qemuxml2argv= data/boot-dev+order.xml index e4bb3b1f48..8a25161d1f 100644 --- a/tests/qemuxml2argvdata/boot-dev+order.xml +++ b/tests/qemuxml2argvdata/boot-dev+order.xml @@ -30,7 +30,7 @@ - + diff --git a/tests/qemuxml2argvdata/boot-order.args b/tests/qemuxml2argvdat= a/boot-order.args index 6d465ff2a8..ab90d22b28 100644 --- a/tests/qemuxml2argvdata/boot-order.args +++ b/tests/qemuxml2argvdata/boot-order.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"file","filename":"/root/boot.iso","node-name":"libvi= rt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-1-0= ,bootindex=3D1 \ --blockdev '{"driver":"sheepdog","server":{"type":"inet","host":"example.or= g","port":"6000"},"vdi":"image","node-name":"libvirt-2-storage","auto-read-= only":true,"discard":"unmap"}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"export":"image","node-name":"libvirt-2-storage","auto-read-on= ly":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,id=3Dvirtio-disk0,bootindex=3D3 \ -blockdev '{"driver":"file","filename":"/dev/null","node-name":"libvirt-1-= storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/boot-order.xml b/tests/qemuxml2argvdata= /boot-order.xml index 6a95658ad2..a810f46021 100644 --- a/tests/qemuxml2argvdata/boot-order.xml +++ b/tests/qemuxml2argvdata/boot-order.xml @@ -27,7 +27,7 @@ - + diff --git a/tests/qemuxml2xmloutdata/boot-order.xml b/tests/qemuxml2xmlout= data/boot-order.xml index 0d884152dd..59568214eb 100644 --- a/tests/qemuxml2xmloutdata/boot-order.xml +++ b/tests/qemuxml2xmloutdata/boot-order.xml @@ -29,7 +29,7 @@ - + --=20 2.37.1 From nobody Sat Feb 7 08:42:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1661430441; cv=none; d=zohomail.com; s=zohoarc; b=UMT7H3AXESMkIwfg9LLnjWxWNiPIaVEfzQQsZLUDBW6AhEQG033/21iwfVMJRTabtPu/GElx/pr0eHO1vP5Yu9Sm/voPxcSKf9FjvjTxsYfRalpuxqaSe3bvHMZz0pZf7rLu/3b9nK7VGftq5WczMItE5tFOZksOT9IpPbNmAD0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661430441; 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=kdwC9FBvs9ZrVn8hYxfgZJOfUBX5/j8da06pK9JsYAo=; b=goVNvhnlD8G8AtEoD9RvVwrTo4935subV78lbl3EuDaHxikRSCY2uaM6t8q/FojoBBLxPZKPdzfSnVxO1+S8KxJoCRSY5RTL55ZhO/VqaowQJrD8O3HnqO7leJSZ0IuWo24CUKCzaLzoJ0DBRXiwLAg5yOjEIK5UQ2J4Hr9GyJo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1661430441662128.88743565296568; Thu, 25 Aug 2022 05:27:21 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-264-6rCYw7RROoqyoSx8EQqoEQ-1; Thu, 25 Aug 2022 08:27:15 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C100C19705C3; Thu, 25 Aug 2022 12:27:06 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC04B1121315; Thu, 25 Aug 2022 12:27:06 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D25A41946A5C; Thu, 25 Aug 2022 12:27:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0EF72194704A for ; Thu, 25 Aug 2022 12:27:05 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id F24B7492CA9; Thu, 25 Aug 2022 12:27:04 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20BF0492CA5 for ; Thu, 25 Aug 2022 12:27:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661430439; 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=kdwC9FBvs9ZrVn8hYxfgZJOfUBX5/j8da06pK9JsYAo=; b=Uw5ZI9zXUIbmtNNcxOEQQjH3la6f/sjKvM+HpOHVlsUecN2asxiLgO3IYegzZTY9L6tp8v 2550aG0U9tFzEX74KaXf/bOiooqH2eX8iWqmOl9AZPNxZzfl23nhOF0RRZNe9exOLBSoJP iSZvZbNggyuqM90W1lTpW8JICp9MuBE= X-MC-Unique: 6rCYw7RROoqyoSx8EQqoEQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/3] tests: qemuxml2argv: Use x86_64 arch and emulator in all boot* test files Date: Thu, 25 Aug 2022 14:27:00 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1661430442360100001 Content-Type: text/plain; charset="utf-8" Using the modern emulator and arch will allow us to convert all of the tests to use DO_TEST_CAPS_LATEST. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuxml2argvdata/boot-cdrom.args | 2 +- tests/qemuxml2argvdata/boot-cdrom.xml | 4 ++-- tests/qemuxml2argvdata/boot-complex.args | 2 +- tests/qemuxml2argvdata/boot-complex.xml | 4 ++-- tests/qemuxml2argvdata/boot-dev+order.xml | 4 ++-- tests/qemuxml2argvdata/boot-floppy.args | 2 +- tests/qemuxml2argvdata/boot-floppy.xml | 4 ++-- tests/qemuxml2argvdata/boot-menu-disable-drive.args | 2 +- tests/qemuxml2argvdata/boot-menu-disable-drive.xml | 4 ++-- tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml | 4 ++-- tests/qemuxml2argvdata/boot-menu-disable.args | 2 +- tests/qemuxml2argvdata/boot-menu-disable.xml | 4 ++-- .../boot-menu-enable-with-timeout-invalid.xml | 4 ++-- tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args | 2 +- tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml | 4 ++-- tests/qemuxml2argvdata/boot-menu-enable.args | 2 +- tests/qemuxml2argvdata/boot-menu-enable.xml | 4 ++-- tests/qemuxml2argvdata/boot-multi.args | 2 +- tests/qemuxml2argvdata/boot-multi.xml | 4 ++-- tests/qemuxml2argvdata/boot-network.args | 2 +- tests/qemuxml2argvdata/boot-network.xml | 4 ++-- tests/qemuxml2argvdata/boot-order.args | 2 +- tests/qemuxml2argvdata/boot-order.xml | 4 ++-- tests/qemuxml2xmloutdata/boot-cdrom.xml | 4 ++-- tests/qemuxml2xmloutdata/boot-floppy.xml | 4 ++-- tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml | 4 ++-- tests/qemuxml2xmloutdata/boot-menu-disable.xml | 4 ++-- tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml | 4 ++-- tests/qemuxml2xmloutdata/boot-multi.xml | 4 ++-- tests/qemuxml2xmloutdata/boot-network.xml | 4 ++-- tests/qemuxml2xmloutdata/boot-order.xml | 4 ++-- 31 files changed, 52 insertions(+), 52 deletions(-) diff --git a/tests/qemuxml2argvdata/boot-cdrom.args b/tests/qemuxml2argvdat= a/boot-cdrom.args index cba00fa112..acd342ecb6 100644 --- a/tests/qemuxml2argvdata/boot-cdrom.args +++ b/tests/qemuxml2argvdata/boot-cdrom.args @@ -6,7 +6,7 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/boot-cdrom.xml b/tests/qemuxml2argvdata= /boot-cdrom.xml index 374c8c38ce..17bdaa06cc 100644 --- a/tests/qemuxml2argvdata/boot-cdrom.xml +++ b/tests/qemuxml2argvdata/boot-cdrom.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm @@ -13,7 +13,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/boot-complex.args b/tests/qemuxml2argvd= ata/boot-complex.args index 5eb78e291b..27ab215bc7 100644 --- a/tests/qemuxml2argvdata/boot-complex.args +++ b/tests/qemuxml2argvdata/boot-complex.args @@ -6,7 +6,7 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/boot-complex.xml b/tests/qemuxml2argvda= ta/boot-complex.xml index 959acfb4ca..b269079f56 100644 --- a/tests/qemuxml2argvdata/boot-complex.xml +++ b/tests/qemuxml2argvdata/boot-complex.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm @@ -16,7 +16,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/boot-dev+order.xml b/tests/qemuxml2argv= data/boot-dev+order.xml index 8a25161d1f..2cbba4b3ce 100644 --- a/tests/qemuxml2argvdata/boot-dev+order.xml +++ b/tests/qemuxml2argvdata/boot-dev+order.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm @@ -15,7 +15,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/boot-floppy.args b/tests/qemuxml2argvda= ta/boot-floppy.args index 467ca1342b..6791337632 100644 --- a/tests/qemuxml2argvdata/boot-floppy.args +++ b/tests/qemuxml2argvdata/boot-floppy.args @@ -6,7 +6,7 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/boot-floppy.xml b/tests/qemuxml2argvdat= a/boot-floppy.xml index 324c9c81d8..5de6f08f44 100644 --- a/tests/qemuxml2argvdata/boot-floppy.xml +++ b/tests/qemuxml2argvdata/boot-floppy.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm @@ -13,7 +13,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args b/tests/qe= muxml2argvdata/boot-menu-disable-drive.args index e307121a6e..38c0b23faf 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args +++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.args @@ -6,7 +6,7 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.xml b/tests/qem= uxml2argvdata/boot-menu-disable-drive.xml index e33b61f13f..22ca640783 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable-drive.xml +++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm @@ -14,7 +14,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml b/te= sts/qemuxml2argvdata/boot-menu-disable-with-timeout.xml index a7ae02fda0..271c5922be 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml +++ b/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm @@ -14,7 +14,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args b/tests/qemuxml2= argvdata/boot-menu-disable.args index e307121a6e..38c0b23faf 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable.args +++ b/tests/qemuxml2argvdata/boot-menu-disable.args @@ -6,7 +6,7 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/boot-menu-disable.xml b/tests/qemuxml2a= rgvdata/boot-menu-disable.xml index 6a61f088d9..80b22b7cad 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable.xml +++ b/tests/qemuxml2argvdata/boot-menu-disable.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm @@ -14,7 +14,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.x= ml b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml index 5af6f5bb95..973ae3c979 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml +++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm @@ -14,7 +14,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args b/te= sts/qemuxml2argvdata/boot-menu-enable-with-timeout.args index d77a63ae5e..01b2282522 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args +++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args @@ -6,7 +6,7 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml b/tes= ts/qemuxml2argvdata/boot-menu-enable-with-timeout.xml index e467aedd1e..f396bdf4c0 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml +++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm @@ -14,7 +14,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args b/tests/qemuxml2a= rgvdata/boot-menu-enable.args index 777918fa80..c282f1ed3d 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable.args +++ b/tests/qemuxml2argvdata/boot-menu-enable.args @@ -6,7 +6,7 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/boot-menu-enable.xml b/tests/qemuxml2ar= gvdata/boot-menu-enable.xml index 5f2f4aedb4..6deaba80ef 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable.xml +++ b/tests/qemuxml2argvdata/boot-menu-enable.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm @@ -14,7 +14,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/boot-multi.args b/tests/qemuxml2argvdat= a/boot-multi.args index 777918fa80..c282f1ed3d 100644 --- a/tests/qemuxml2argvdata/boot-multi.args +++ b/tests/qemuxml2argvdata/boot-multi.args @@ -6,7 +6,7 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/boot-multi.xml b/tests/qemuxml2argvdata= /boot-multi.xml index 83f8e6aa23..0e4c5111e0 100644 --- a/tests/qemuxml2argvdata/boot-multi.xml +++ b/tests/qemuxml2argvdata/boot-multi.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm @@ -17,7 +17,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/boot-network.args b/tests/qemuxml2argvd= ata/boot-network.args index 451e5ef66a..b36f58bbac 100644 --- a/tests/qemuxml2argvdata/boot-network.args +++ b/tests/qemuxml2argvdata/boot-network.args @@ -6,7 +6,7 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/boot-network.xml b/tests/qemuxml2argvda= ta/boot-network.xml index 6233605ac5..003f607f80 100644 --- a/tests/qemuxml2argvdata/boot-network.xml +++ b/tests/qemuxml2argvdata/boot-network.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm @@ -13,7 +13,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/boot-order.args b/tests/qemuxml2argvdat= a/boot-order.args index ab90d22b28..0e49742f5d 100644 --- a/tests/qemuxml2argvdata/boot-order.args +++ b/tests/qemuxml2argvdata/boot-order.args @@ -6,7 +6,7 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/boot-order.xml b/tests/qemuxml2argvdata= /boot-order.xml index a810f46021..4edbe5ed94 100644 --- a/tests/qemuxml2argvdata/boot-order.xml +++ b/tests/qemuxml2argvdata/boot-order.xml @@ -5,14 +5,14 @@ 219100 1 - hvm + hvm destroy restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2xmloutdata/boot-cdrom.xml b/tests/qemuxml2xmlout= data/boot-cdrom.xml index 4729edaa63..4666777e56 100644 --- a/tests/qemuxml2xmloutdata/boot-cdrom.xml +++ b/tests/qemuxml2xmloutdata/boot-cdrom.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm @@ -13,7 +13,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2xmloutdata/boot-floppy.xml b/tests/qemuxml2xmlou= tdata/boot-floppy.xml index 0bf53f50f1..7c163b5c99 100644 --- a/tests/qemuxml2xmloutdata/boot-floppy.xml +++ b/tests/qemuxml2xmloutdata/boot-floppy.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm @@ -13,7 +13,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml b/= tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml index 82285b3017..04c8d42513 100644 --- a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml +++ b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm @@ -14,7 +14,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable.xml b/tests/qemuxml= 2xmloutdata/boot-menu-disable.xml index 82285b3017..04c8d42513 100644 --- a/tests/qemuxml2xmloutdata/boot-menu-disable.xml +++ b/tests/qemuxml2xmloutdata/boot-menu-disable.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm @@ -14,7 +14,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml b/t= ests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml index 994331ce0f..e951750af5 100644 --- a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml +++ b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm @@ -14,7 +14,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2xmloutdata/boot-multi.xml b/tests/qemuxml2xmlout= data/boot-multi.xml index abb098be58..8c16bd9d11 100644 --- a/tests/qemuxml2xmloutdata/boot-multi.xml +++ b/tests/qemuxml2xmloutdata/boot-multi.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm @@ -17,7 +17,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2xmloutdata/boot-network.xml b/tests/qemuxml2xmlo= utdata/boot-network.xml index 7df0512077..4722ede3b7 100644 --- a/tests/qemuxml2xmloutdata/boot-network.xml +++ b/tests/qemuxml2xmloutdata/boot-network.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm @@ -13,7 +13,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2xmloutdata/boot-order.xml b/tests/qemuxml2xmlout= data/boot-order.xml index 59568214eb..843bebda9c 100644 --- a/tests/qemuxml2xmloutdata/boot-order.xml +++ b/tests/qemuxml2xmloutdata/boot-order.xml @@ -5,14 +5,14 @@ 219100 1 - hvm + hvm destroy restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 --=20 2.37.1 From nobody Sat Feb 7 08:42:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1661430434; cv=none; d=zohomail.com; s=zohoarc; b=gsAB5lQg/4w5+6XxJxY0ZBJORt7RGriFCZBQxg7z2ZbuohfYWbx7jcLcOfQfQEpgBmu21db3ShcLBrdZQT8iFJyJ9SDpW+6CbOc51ovXLTyK0b70P7Ty7+AeJB4aP+ig/QRNCri0nOXjW0UynWwO0X4YAiZkC9uV+E0Mj5UgkhQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661430434; 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=TbtXVnEzf601QwEbDdI9IiBVMPqlCQyFmxRvpV9qDvI=; b=All0/q8cu+FrVda6P1RvOSBQeEx648sSWaIQ8s4jhlnWvVBRmuBYsPWSAKGTDMwR1oGx50XWpSaNISNce4xNr6HZmmSeIeHE9p3ttJWVo2JKUPKZlS97rrJZmYgwP+z7pb6r/n8msSteCi4rfCcBrq2sjyIjnkOL1wiNMCGD1J8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1661430434814561.5273686656509; Thu, 25 Aug 2022 05:27:14 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-163-jEb7MqRtM9iXG-09fMC05A-1; Thu, 25 Aug 2022 08:27:12 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 592C9382F1B6; Thu, 25 Aug 2022 12:27:07 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4158614152E3; Thu, 25 Aug 2022 12:27:07 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 372021946A66; Thu, 25 Aug 2022 12:27:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1FCFE1947064 for ; Thu, 25 Aug 2022 12:27:06 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 13485492CA5; Thu, 25 Aug 2022 12:27:06 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5965E492CAE for ; Thu, 25 Aug 2022 12:27:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661430433; 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=TbtXVnEzf601QwEbDdI9IiBVMPqlCQyFmxRvpV9qDvI=; b=PnaJjwdqEj4x4WUsQXV0OSpCV7yqHUbQik8yNnKEWjzkpCUBzJQ4QTUFWbXG+tjLxgrFrd q2MoUo2lK+bV56pJWvLDrcfSJdV/gXkDcqAy1Sckf851ruMUkXCBvQIg9SX4SX+3Wgvh4s ODFFDVF7lEHuZhhlXBMty5aFN7WbFy0= X-MC-Unique: jEb7MqRtM9iXG-09fMC05A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/3] tests: qemuxml2argv: Convert all 'boot*' cases to DO_TEST_CAPS_LATEST Date: Thu, 25 Aug 2022 14:27:01 +0200 Message-Id: <4e1401c488595d45c46c2ee24e03ab9cfaead59a.1661430370.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1661430436491100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...rom.args =3D> boot-cdrom.x86_64-latest.args} | 11 ++++--- ...x.args =3D> boot-complex.x86_64-latest.args} | 27 +++++++++------- .../boot-dev+order.x86_64-latest.err | 1 + ...rgs =3D> boot-floppy-q35.x86_64-latest.args} | 14 +++++--- ...py.args =3D> boot-floppy.x86_64-latest.args} | 13 +++++--- ...oot-menu-disable-drive.x86_64-latest.args} | 13 +++++--- ...s =3D> boot-menu-disable.x86_64-latest.args} | 13 +++++--- ...ble-with-timeout-invalid.x86_64-latest.err | 1 + ...nu-enable-with-timeout.x86_64-latest.args} | 13 +++++--- ...gs =3D> boot-menu-enable.x86_64-latest.args} | 13 +++++--- ...lti.args =3D> boot-multi.x86_64-latest.args} | 13 +++++--- ...k.args =3D> boot-network.x86_64-latest.args} | 11 ++++--- ...der.args =3D> boot-order.x86_64-latest.args} | 21 ++++++------ tests/qemuxml2argvtest.c | 32 ++++++++----------- 14 files changed, 115 insertions(+), 81 deletions(-) rename tests/qemuxml2argvdata/{boot-cdrom.args =3D> boot-cdrom.x86_64-late= st.args} (64%) rename tests/qemuxml2argvdata/{boot-complex.args =3D> boot-complex.x86_64-= latest.args} (63%) create mode 100644 tests/qemuxml2argvdata/boot-dev+order.x86_64-latest.err rename tests/qemuxml2argvdata/{boot-floppy-q35.args =3D> boot-floppy-q35.x= 86_64-latest.args} (55%) rename tests/qemuxml2argvdata/{boot-floppy.args =3D> boot-floppy.x86_64-la= test.args} (67%) rename tests/qemuxml2argvdata/{boot-menu-disable-drive.args =3D> boot-menu= -disable-drive.x86_64-latest.args} (60%) rename tests/qemuxml2argvdata/{boot-menu-disable.args =3D> boot-menu-disab= le.x86_64-latest.args} (60%) create mode 100644 tests/qemuxml2argvdata/boot-menu-enable-with-timeout-in= valid.x86_64-latest.err rename tests/qemuxml2argvdata/{boot-menu-enable-with-timeout.args =3D> boo= t-menu-enable-with-timeout.x86_64-latest.args} (61%) rename tests/qemuxml2argvdata/{boot-menu-enable.args =3D> boot-menu-enable= .x86_64-latest.args} (60%) rename tests/qemuxml2argvdata/{boot-multi.args =3D> boot-multi.x86_64-late= st.args} (60%) rename tests/qemuxml2argvdata/{boot-network.args =3D> boot-network.x86_64-= latest.args} (65%) rename tests/qemuxml2argvdata/{boot-order.args =3D> boot-order.x86_64-late= st.args} (62%) diff --git a/tests/qemuxml2argvdata/boot-cdrom.args b/tests/qemuxml2argvdat= a/boot-cdrom.x86_64-latest.args similarity index 64% rename from tests/qemuxml2argvdata/boot-cdrom.args rename to tests/qemuxml2argvdata/boot-cdrom.x86_64-latest.args index acd342ecb6..c1c9824f3f 100644 --- a/tests/qemuxml2argvdata/boot-cdrom.args +++ b/tests/qemuxml2argvdata/boot-cdrom.x86_64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -25,9 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-complex.args b/tests/qemuxml2argvd= ata/boot-complex.x86_64-latest.args similarity index 63% rename from tests/qemuxml2argvdata/boot-complex.args rename to tests/qemuxml2argvdata/boot-complex.x86_64-latest.args index 27ab215bc7..b3b301b602 100644 --- a/tests/qemuxml2argvdata/boot-complex.args +++ b/tests/qemuxml2argvdata/boot-complex.x86_64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -25,32 +27,33 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -global isa-fdc.bootindexA=3D4 \ -blockdev '{"driver":"file","filename":"/tmp/vda.img","node-name":"libvirt= -7-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"raw= ","file":"libvirt-7-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-7= -format,id=3Dvirtio-disk0,bootindex=3D3 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-7-format","id":"virtio-disk0","bootindex":3}' \ -blockdev '{"driver":"file","filename":"/tmp/vdb.img","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=3D0x5,drive=3Dlibvirt-6= -format,id=3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-6-format","id":"virtio-disk1"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/hda","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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-5-format,id=3Dide0-0-0= \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-5-form= at","id":"ide0-0-0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/hdb","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 ide-hd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-4-format,id=3Dide0-0-1= \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-4-form= at","id":"ide0-0-1"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/hdc","node-name= ":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-3-form= at","id":"ide0-1-0","bootindex":1}' \ -blockdev '{"driver":"host_device","filename":"/dev/fd0","node-name":"libv= irt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device floppy,unit=3D0,drive=3Dlibvirt-2-format,id=3Dfdc0-0-0 \ +-device '{"driver":"floppy","unit":0,"drive":"libvirt-2-format","id":"fdc0= -0-0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/fd1","node-name":"libv= irt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device floppy,unit=3D1,drive=3Dlibvirt-1-format,id=3Dfdc0-0-1 \ +-device '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ -netdev user,id=3Dhostnet0 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:11= ,bootindex=3D2,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:11","bootindex":2,"bus":"pci.0","addr":"0x2"}' \ -netdev user,id=3Dhostnet1 \ --device virtio-net-pci,netdev=3Dhostnet1,id=3Dnet1,mac=3D00:11:22:33:44:22= ,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":= "00:11:22:33:44:22","bus":"pci.0","addr":"0x3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-dev+order.x86_64-latest.err b/test= s/qemuxml2argvdata/boot-dev+order.x86_64-latest.err new file mode 100644 index 0000000000..aeb27ec0b8 --- /dev/null +++ b/tests/qemuxml2argvdata/boot-dev+order.x86_64-latest.err @@ -0,0 +1 @@ +unsupported configuration: per-device boot elements cannot be used togethe= r with os/boot elements diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.args b/tests/qemuxml2ar= gvdata/boot-floppy-q35.x86_64-latest.args similarity index 55% rename from tests/qemuxml2argvdata/boot-floppy-q35.args rename to tests/qemuxml2argvdata/boot-floppy-q35.x86_64-latest.args index 7a4737f925..7f34c7a965 100644 --- a/tests/qemuxml2argvdata/boot-floppy-q35.args +++ b/tests/qemuxml2argvdata/boot-floppy-q35.x86_64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -25,9 +27,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device isa-fdc,bootindexA=3D1 \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"isa-fdc","bootindexA":1}' \ -blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device floppy,unit=3D0,drive=3Dlibvirt-1-format,id=3Dfdc0-0-0 \ +-device '{"driver":"floppy","unit":0,"drive":"libvirt-1-format","id":"fdc0= -0-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-floppy.args b/tests/qemuxml2argvda= ta/boot-floppy.x86_64-latest.args similarity index 67% rename from tests/qemuxml2argvdata/boot-floppy.args rename to tests/qemuxml2argvdata/boot-floppy.x86_64-latest.args index 6791337632..8b962a33f6 100644 --- a/tests/qemuxml2argvdata/boot-floppy.args +++ b/tests/qemuxml2argvdata/boot-floppy.x86_64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -25,13 +27,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -global isa-fdc.bootindexA=3D1 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0"}' \ -blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device floppy,unit=3D0,drive=3Dlibvirt-1-format,id=3Dfdc0-0-0 \ +-device '{"driver":"floppy","unit":0,"drive":"libvirt-1-format","id":"fdc0= -0-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args b/tests/qe= muxml2argvdata/boot-menu-disable-drive.x86_64-latest.args similarity index 60% rename from tests/qemuxml2argvdata/boot-menu-disable-drive.args rename to tests/qemuxml2argvdata/boot-menu-disable-drive.x86_64-latest.args index 38c0b23faf..ecaadfe331 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args +++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.x86_64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -25,10 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot menu=3Doff,strict=3Don \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args b/tests/qemuxml2= argvdata/boot-menu-disable.x86_64-latest.args similarity index 60% rename from tests/qemuxml2argvdata/boot-menu-disable.args rename to tests/qemuxml2argvdata/boot-menu-disable.x86_64-latest.args index 38c0b23faf..ecaadfe331 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable.args +++ b/tests/qemuxml2argvdata/boot-menu-disable.x86_64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -25,10 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot menu=3Doff,strict=3Don \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.x= 86_64-latest.err b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-inv= alid.x86_64-latest.err new file mode 100644 index 0000000000..38c0be7818 --- /dev/null +++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.x86_64-l= atest.err @@ -0,0 +1 @@ +unsupported configuration: invalid value for boot menu timeout, must be in= range [0,65535] diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args b/te= sts/qemuxml2argvdata/boot-menu-enable-with-timeout.x86_64-latest.args similarity index 61% rename from tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args rename to tests/qemuxml2argvdata/boot-menu-enable-with-timeout.x86_64-lates= t.args index 01b2282522..bc1de4728e 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args +++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.x86_64-latest.ar= gs @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -25,10 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot menu=3Don,splash-time=3D3000,strict=3Don \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args b/tests/qemuxml2a= rgvdata/boot-menu-enable.x86_64-latest.args similarity index 60% rename from tests/qemuxml2argvdata/boot-menu-enable.args rename to tests/qemuxml2argvdata/boot-menu-enable.x86_64-latest.args index c282f1ed3d..16c3acb6fc 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable.args +++ b/tests/qemuxml2argvdata/boot-menu-enable.x86_64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -25,10 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-multi.args b/tests/qemuxml2argvdat= a/boot-multi.x86_64-latest.args similarity index 60% rename from tests/qemuxml2argvdata/boot-multi.args rename to tests/qemuxml2argvdata/boot-multi.x86_64-latest.args index c282f1ed3d..16c3acb6fc 100644 --- a/tests/qemuxml2argvdata/boot-multi.args +++ b/tests/qemuxml2argvdata/boot-multi.x86_64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -25,10 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-network.args b/tests/qemuxml2argvd= ata/boot-network.x86_64-latest.args similarity index 65% rename from tests/qemuxml2argvdata/boot-network.args rename to tests/qemuxml2argvdata/boot-network.x86_64-latest.args index b36f58bbac..2803553da6 100644 --- a/tests/qemuxml2argvdata/boot-network.args +++ b/tests/qemuxml2argvdata/boot-network.x86_64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -25,9 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-order.args b/tests/qemuxml2argvdat= a/boot-order.x86_64-latest.args similarity index 62% rename from tests/qemuxml2argvdata/boot-order.args rename to tests/qemuxml2argvdata/boot-order.x86_64-latest.args index 0e49742f5d..bbb27d6831 100644 --- a/tests/qemuxml2argvdata/boot-order.args +++ b/tests/qemuxml2argvdata/boot-order.x86_64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -25,22 +27,23 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -global isa-fdc.bootindexB=3D4 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-4-format,id=3Dide0-0-0= \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-4-form= at","id":"ide0-0-0"}' \ -blockdev '{"driver":"file","filename":"/root/boot.iso","node-name":"libvi= rt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-3-form= at","id":"ide0-1-0","bootindex":1}' \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"export":"image","node-name":"libvirt-2-storage","auto-read-on= ly":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,id=3Dvirtio-disk0,bootindex=3D3 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-2-format","id":"virtio-disk0","bootindex":3}' \ -blockdev '{"driver":"file","filename":"/dev/null","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 floppy,unit=3D1,drive=3Dlibvirt-1-format,id=3Dfdc0-0-1 \ +-device '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ -netdev user,id=3Dhostnet0 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55= ,bootindex=3D2,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bootindex":2,"bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 32f1e8ce3b..f2c443aa47 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1077,24 +1077,20 @@ mymain(void) DO_TEST_NOCAPS("default-kvm-host-arch"); DO_TEST_NOCAPS("default-qemu-host-arch"); DO_TEST_CAPS_LATEST("x86-kvm-32-on-64"); - DO_TEST_NOCAPS("boot-cdrom"); - DO_TEST_NOCAPS("boot-network"); - DO_TEST_NOCAPS("boot-floppy"); - DO_TEST("boot-floppy-q35", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI); - DO_TEST_NOCAPS("boot-multi"); - DO_TEST_NOCAPS("boot-menu-enable"); - DO_TEST_NOCAPS("boot-menu-enable-with-timeout"); - DO_TEST_PARSE_ERROR_NOCAPS("boot-menu-enable-with-timeout-invalid"); - DO_TEST_NOCAPS("boot-menu-disable"); - DO_TEST_NOCAPS("boot-menu-disable-drive"); - DO_TEST_PARSE_ERROR("boot-dev+order", - QEMU_CAPS_VIRTIO_BLK_SCSI); - DO_TEST("boot-order", - QEMU_CAPS_VIRTIO_BLK_SCSI); - DO_TEST("boot-complex", - QEMU_CAPS_VIRTIO_BLK_SCSI); + DO_TEST_CAPS_LATEST("boot-cdrom"); + DO_TEST_CAPS_LATEST("boot-network"); + DO_TEST_CAPS_LATEST("boot-floppy"); + DO_TEST_CAPS_LATEST("boot-floppy-q35"); + DO_TEST_CAPS_LATEST("boot-multi"); + DO_TEST_CAPS_LATEST("boot-menu-enable"); + DO_TEST_CAPS_LATEST("boot-menu-enable-with-timeout"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("boot-menu-enable-with-timeout-invalid= "); + DO_TEST_CAPS_LATEST("boot-menu-disable"); + DO_TEST_CAPS_LATEST("boot-menu-disable-drive"); + + DO_TEST_CAPS_LATEST_PARSE_ERROR("boot-dev+order"); + DO_TEST_CAPS_LATEST("boot-order"); + DO_TEST_CAPS_LATEST("boot-complex"); DO_TEST_CAPS_LATEST("audio-none-minimal"); DO_TEST_CAPS_LATEST("audio-alsa-minimal"); --=20 2.37.1