From nobody Sat Feb 7 07:44:17 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=1632315767; cv=none; d=zohomail.com; s=zohoarc; b=Ns7aId3YENHFDhfxtAaapprFHpx2jYm2Tpd0f0be0lE4eK/5cRQnW2AKyxnqKFrCCWJhc7N5IvZybv3C/PrBL+s21t21X3MbEJeDFsAakapF394f0p0/jMmGNHxJEnuT9vrYbnZ1X6zSaJDBZMIQwVD5C3r9I8FBWPpODX9yx20= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632315767; 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=80glcFlPcp08CPJqTr+qXGl5FDQHxA/GhQGNbnqZaBQ=; b=SemdGLydBGOi4zhLCln15mhgnn3wwiI7OJQilJVHApF1h3U6fpcseRqwOmSrZ2oem3euKEmdewTp7JAj+TMPXARMGe1dgJY2R45yND9WPl905/zBak4Xnh8l4aeYjgAWUABOAopS8S0QN6p251+imkrubvUL53N2TReowuE7wdI= 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 1632315767472825.7913467721055; Wed, 22 Sep 2021 06:02:47 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-386-JJwkg4psOJqhNqwA--bsRA-1; Wed, 22 Sep 2021 09:02:44 -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 E5C5F1922962; Wed, 22 Sep 2021 13:02:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A829F18B5E; Wed, 22 Sep 2021 13:02:37 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A73C64EA29; Wed, 22 Sep 2021 13:02:34 +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 18MD2XWY020280 for ; Wed, 22 Sep 2021 09:02:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 318245D9DC; Wed, 22 Sep 2021 13:02:33 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 846E45D9CA for ; Wed, 22 Sep 2021 13:02:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632315765; 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=80glcFlPcp08CPJqTr+qXGl5FDQHxA/GhQGNbnqZaBQ=; b=QVHBoCWst9xOvxdXSYcxPO7G0UJvhmK18Zw3Se+VhCQaaLHFoRdXmFCh82NssLZCGmUfON jEgKT3D4r4ulRTlGrHuw0BCj9XZeVGPEZAcE1lfGLyanGC9Z4Yxgs8fz7Hn/iXCijmt7X7 CMgJ90eim84h9noPrXLW2umHhtYh8pM= X-MC-Unique: JJwkg4psOJqhNqwA--bsRA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 01/20] testCompareXMLToArgv: Avoid use of uninitialized 'monitor_chr' Date: Wed, 22 Sep 2021 15:02:10 +0200 Message-Id: <7bfd065ec326111a6c4fa17a1e79f94d72a4875a.1632315628.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 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1632315782770100003 Content-Type: text/plain; charset="utf-8" Failure of 'testQemuInfoInitArgs' jumps over the initialization of 'monitor_chr' via memset, which leads to a crash. Signed-off-by: Peter Krempa --- tests/qemuxml2argvtest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f0cfca014c..675537b05d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -642,14 +642,14 @@ testCompareXMLToArgv(const void *data) virArch arch =3D VIR_ARCH_NONE; g_autoptr(virIdentity) sysident =3D virIdentityGetSystem(); + memset(&monitor_chr, 0, sizeof(monitor_chr)); + if (testQemuInfoInitArgs((struct testQemuInfo *) info) < 0) goto cleanup; if (info->arch !=3D VIR_ARCH_NONE && info->arch !=3D VIR_ARCH_X86_64) qemuTestSetHostArch(&driver, info->arch); - memset(&monitor_chr, 0, sizeof(monitor_chr)); - if (!(conn =3D virGetConnect())) goto cleanup; --=20 2.31.1 From nobody Sat Feb 7 07:44:17 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=1632315778; cv=none; d=zohomail.com; s=zohoarc; b=NSdxzoLL4TlpMUd8j3yaOxGE7VuAUCjkg6ei3dZJIZ4JZXMqE0LY/4oK55qrjW3iwMRwIU3OaR/xQFIxn32lDkNbRB2kL4kV2/+rjJ8cEVL1qLs8GsDpba9Q4yA/9d16b8uEScq58gm9bXMgUDjc7Ybo4AiefYIOomMfjGus4D4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632315778; 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=a/XTt+w8VjryvPNMiUcdOwVoAMTLKzJSaJlUpUPgngI=; b=MUyrSDAepljCkJMRIrRyLF2xEyyLR2ID1BoUa0AQjMelspdv8HNQKcYAOoz3Zzs6CrYPJFvfpVM/Ydci1ydaIUnj4e20PXseCvj6PWar1wGQCAclu4bvybFfy20icYftrHt5ZMcujVUCf4JvoMmLGocD8nSNV0sMmFCWSsYgjkc= 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 1632315778256873.6367258071879; Wed, 22 Sep 2021 06:02:58 -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-90-tBIJSC07PzaEzte95SuxqA-1; Wed, 22 Sep 2021 09:02:55 -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 DFF57801B3D; Wed, 22 Sep 2021 13:02:49 +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 B4BE316A30; Wed, 22 Sep 2021 13:02:49 +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 7D2041818480; Wed, 22 Sep 2021 13:02:49 +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 18MD2YEc020290 for ; Wed, 22 Sep 2021 09:02:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4E9EB5D9F4; Wed, 22 Sep 2021 13:02:34 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F2735D9DC for ; Wed, 22 Sep 2021 13:02:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632315777; 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=a/XTt+w8VjryvPNMiUcdOwVoAMTLKzJSaJlUpUPgngI=; b=fISgiTiUHthzPM/0C/xv1yV0dQrdgf2b7o2wB5eKV49B79ZwBmcfQYfpuBLJ5kAEvO66q8 aXE6cg2+Ha8XRSmr9kPbqJEkC9MC0LByhDdkgo8mOCD+2gfb4QmEq9SOOgd1bmt6tCSakD edY23Tj5jrct9cAoKgNgA/qDs5shFZg= X-MC-Unique: tBIJSC07PzaEzte95SuxqA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 02/20] testQemuInfoInitArgs: Report error if path to 'latest' caps for an arch is NULL Date: Wed, 22 Sep 2021 15:02:11 +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.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1632315792182100002 Content-Type: text/plain; charset="utf-8" When looking up the 'latest' caps they might not be present. Report an error instead of crashing. Signed-off-by: Peter Krempa --- tests/testutilsqemu.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 164d601613..505c66b818 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -772,6 +772,12 @@ testQemuInfoInitArgs(struct testQemuInfo *info) if (STREQ(info->args.capsver, "latest")) { capsfile =3D g_strdup(virHashLookup(info->conf->capslatest, in= fo->args.capsarch)); + + if (!capsfile) { + fprintf(stderr, "'latest' caps for '%s' were not found\n",= info->args.capsarch); + return -1; + } + stripmachinealiases =3D true; } else { capsfile =3D g_strdup_printf("%s/caps_%s.%s.xml", --=20 2.31.1 From nobody Sat Feb 7 07:44:17 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=1632315768; cv=none; d=zohomail.com; s=zohoarc; b=Q0q7bYeAyB5rHQ5fPV/r9E6hCxupQIEZflfqe3/VpdPhd0Afgpgzq+EFkf6765TMFUuJyR553jeLIVmuWKPWTGhiSWAJWZjHzmgulHmz1pWF9gFKU/M74LLT6B8LP082hJkzQ1je8tnebJt6MaeWNOILXcCkkN+UBb1ww0GjYkU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632315768; 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=CTAWbgqSiSTCxYHjJ3gXIuGyonOHmABCjZRd8nNmcVs=; b=DM+tSXSM0R1fszaHqnlKq1kI3H0c8ZbCQxVXUdJ/Fzp2NHhKsKqdpIjqZzqnvHZ/q9ZoCo21YzYQDi+4asfsdQvrqJqDXbI5xJ1eVoQyaBluaMLa+ac9DkSK4KgYhYOKhRuSiKDQTRCdlfTDOinNScuI1GyniZsCiOnrVVTe3Oo= 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 1632315768168558.6775359167461; Wed, 22 Sep 2021 06:02:48 -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-212-YGxsTEetNDeRWFF5Eqvlaw-1; Wed, 22 Sep 2021 09:02:45 -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 19F0C9F92A; Wed, 22 Sep 2021 13:02:40 +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 E83CA60C82; Wed, 22 Sep 2021 13:02:39 +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 B93E91806D01; Wed, 22 Sep 2021 13:02:39 +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 18MD2ZUP020298 for ; Wed, 22 Sep 2021 09:02:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6D66B5D9CA; Wed, 22 Sep 2021 13:02:35 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF9A55D9DC for ; Wed, 22 Sep 2021 13:02:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632315766; 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=CTAWbgqSiSTCxYHjJ3gXIuGyonOHmABCjZRd8nNmcVs=; b=d0Lom2xQEXzJLCIJw+Ze2FmeX9Z0cIRrR8aAKIToief36PSyp75YSqgwCek4L2GAdZzk8k tvpaexBiImuMUC/X1a3GkqgSqz4DjkFNUAHlvXn6O0vleGfK1y1atV0vRDS7hUjK0aZzkI krJXG1r//rxm5Zwf81q+W8NoQFRSdO8= X-MC-Unique: YGxsTEetNDeRWFF5Eqvlaw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/20] qemuxml2argvtest: Remove 'boot-strict' case Date: Wed, 22 Sep 2021 15:02:12 +0200 Message-Id: <805463191b096d42cc46a33bc28c425a990cbee2.1632315628.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.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1632315783480100005 Content-Type: text/plain; charset="utf-8" It's identical to 'boot-order'. Signed-off-by: Peter Krempa --- tests/qemuxml2argvdata/boot-strict.args | 48 ------------------ tests/qemuxml2argvdata/boot-strict.xml | 66 ------------------------- tests/qemuxml2argvtest.c | 2 - 3 files changed, 116 deletions(-) delete mode 100644 tests/qemuxml2argvdata/boot-strict.args delete mode 100644 tests/qemuxml2argvdata/boot-strict.xml diff --git a/tests/qemuxml2argvdata/boot-strict.args b/tests/qemuxml2argvda= ta/boot-strict.args deleted file mode 100644 index 90d3770117..0000000000 --- a/tests/qemuxml2argvdata/boot-strict.args +++ /dev/null @@ -1,48 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-i386 \ --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,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --drive file=3D/tmp/vda.img,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-vir= tio-disk0,id=3Dvirtio-disk0,bootindex=3D3 \ --drive file=3D/tmp/vdb.img,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk1 \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-vir= tio-disk1,id=3Dvirtio-disk1 \ --drive file=3D/dev/HostVG/hda,format=3Draw,if=3Dnone,id=3Ddrive-ide0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0 \ --drive file=3D/dev/HostVG/hdb,format=3Draw,if=3Dnone,id=3Ddrive-ide0-0-1 \ --device ide-hd,bus=3Dide.0,unit=3D1,drive=3Ddrive-ide0-0-1,id=3Dide0-0-1 \ --drive file=3D/dev/HostVG/hdc,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,r= eadonly=3Don \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ --drive file=3D/dev/fd0,format=3Draw,if=3Dnone,id=3Ddrive-fdc0-0-0 \ --drive file=3D/dev/fd1,format=3Draw,if=3Dnone,id=3Ddrive-fdc0-0-1 \ --global isa-fdc.driveA=3Ddrive-fdc0-0-0 \ --global isa-fdc.bootindexA=3D4 \ --global isa-fdc.driveB=3Ddrive-fdc0-0-1 \ --netdev user,id=3Dhostnet0 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:11= ,bus=3Dpci.0,addr=3D0x2,bootindex=3D2 \ --netdev user,id=3Dhostnet1 \ --device virtio-net-pci,netdev=3Dhostnet1,id=3Dnet1,mac=3D00:11:22:33:44:22= ,bus=3Dpci.0,addr=3D0x3 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-strict.xml b/tests/qemuxml2argvdat= a/boot-strict.xml deleted file mode 100644 index 959acfb4ca..0000000000 --- a/tests/qemuxml2argvdata/boot-strict.xml +++ /dev/null @@ -1,66 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - - - - - -
- - - - -
- - - - - - - - -
- - - - -
- - - - -
- - - - - - - - - - - - - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 675537b05d..cca0542b32 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1078,8 +1078,6 @@ mymain(void) QEMU_CAPS_VIRTIO_BLK_SCSI); DO_TEST("boot-complex", QEMU_CAPS_VIRTIO_BLK_SCSI); - DO_TEST("boot-strict", - QEMU_CAPS_VIRTIO_BLK_SCSI); /* Simplest possible