From nobody Mon Feb 9 13:57:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.25 as permitted sender) client-ip=209.132.183.25; envelope-from=libvir-list-bounces@redhat.com; helo=mx4-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.25 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by mx.zohomail.com with SMTPS id 1486912691343112.35334736400432; Sun, 12 Feb 2017 07:18:11 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1CFDuva027433; Sun, 12 Feb 2017 10:13:56 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1CFD2Sg024769 for ; Sun, 12 Feb 2017 10:13:02 -0500 Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.31]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1CFD2sj022905 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Sun, 12 Feb 2017 10:13:02 -0500 Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E5CF8C00B8ED for ; Sun, 12 Feb 2017 15:13:00 +0000 (UTC) Received: by mail-lf0-f67.google.com with SMTP id h65so6539094lfi.3 for ; Sun, 12 Feb 2017 07:12:59 -0800 (PST) Received: from kloomba.my.domain ([95.104.139.40]) by smtp.gmail.com with ESMTPSA id h9sm1414489ljb.51.2017.02.12.07.12.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Feb 2017 07:12:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mq2q1CsL0I7O0agB6mzXCEmk67OY4lpzhH0qblOug2k=; b=Ez3rf34u6giWQ5t6QKAOGs7MiLQDVw1HQZsYw8wyLRWWDsyphWVwO1zMpbRGZnjMFt z1D5Shr1wDIFwYL+KIjsrUep6RlPIWnJTuffu+5+l06glg4RbuNXNyFNbQpNFIDvmxy5 i/Re/+qDrwDUnOuwaZIJW5V8FHKZLEzVJcKoh+X0n2QgNy+lsVepAHYXLcOMwjx1hZIj wy2Q3bMe2Wn4+E3v880toWfRkJRVPGjupgSKhsH92ff9/7c/vx4gdaI4IJDFxtmeBt57 iFQXDSjItV45dlBN4seTtQuAUv1p23NNToxYJohBjx6ioPS8jkuDWyFyolYXCeGB8k+l uTew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mq2q1CsL0I7O0agB6mzXCEmk67OY4lpzhH0qblOug2k=; b=ShC6d6Jp3C6NDIyEmVrxHqzM48jWy/IcAYHJh5UmR5nz1t/KNZlbmffXIod3VdoMA1 H+PAbB7kSBYoIODr77x10JAlRWJVdNGJCixqwtSvdMeWxdMYj3vGABXKNxA7MDfJ83oX FXSp8eZDk2/vju98xyo+/Kibc1foLYuxXUFwdUyRd/t6lgDx45xTNSzG8ececMYP7TRS pflMHo9y6jtm8hEC9Qj9UjLiy3M4DGIJgypn1X4TYxy8miBdAUBXOmilyUfkkxsrW4vX OM6bUGOXmQtSYja3eImgRGTERK6qTDKt6VN2VcMjnSijnFJgqo1b/6MW6vIGJbWWIU3f vaaA== X-Gm-Message-State: AMke39mjarzokOrOXWfzs11aryc8OfhNUO1J6/o/X4Ah/7QeTVdTXi2blQAsx75H9i0snw== X-Received: by 10.46.33.75 with SMTP id h72mr5937665ljh.37.1486912378336; Sun, 12 Feb 2017 07:12:58 -0800 (PST) From: Roman Bogorodskiy To: libvir-list@redhat.com Date: Sun, 12 Feb 2017 19:12:31 +0400 Message-Id: <20170212151234.25936-4-bogorodskiy@gmail.com> In-Reply-To: <20170212151234.25936-1-bogorodskiy@gmail.com> References: <20170212151234.25936-1-bogorodskiy@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Sun, 12 Feb 2017 15:13:01 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Sun, 12 Feb 2017 15:13:01 +0000 (UTC) for IP:'209.85.215.67' DOMAIN:'mail-lf0-f67.google.com' HELO:'mail-lf0-f67.google.com' FROM:'bogorodskiy@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.67 (BAYES_50, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 209.85.215.67 mail-lf0-f67.google.com 209.85.215.67 mail-lf0-f67.google.com X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.31 X-loop: libvir-list@redhat.com Cc: Fabian Freyer , Roman Bogorodskiy Subject: [libvirt] [PATCH 3/6] bhyve: test cases for UEFI bhyvexml2argvtest 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Fabian Freyer Signed-off-by: Roman Bogorodskiy --- tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args | 11 +++++++++++ tests/bhyvexml2argvdata/bhyvexml2argv-uefi.ldargs | 1 + tests/bhyvexml2argvdata/bhyvexml2argv-uefi.xml | 23 +++++++++++++++++++= ++++ tests/bhyvexml2argvtest.c | 13 +++++++++++-- 4 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-uefi.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-uefi.xml diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args b/tests/bhyvex= ml2argvdata/bhyvexml2argv-uefi.args new file mode 100644 index 000000000..8ff8673ed --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args @@ -0,0 +1,11 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-l bootrom,/path/to/test.fd \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=3D52:54:00:00:00:00 \ +-s 1,lpc bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.ldargs b/tests/bhyv= exml2argvdata/bhyvexml2argv-uefi.ldargs new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.ldargs @@ -0,0 +1 @@ +dummy diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.xml b/tests/bhyvexm= l2argvdata/bhyvexml2argv-uefi.xml new file mode 100644 index 000000000..0b7d6bd27 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.xml @@ -0,0 +1,23 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + /path/to/test.fd + + + + + + +
+ + + + +
+ + + diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index fb404f9fb..8567ceeae 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -52,9 +52,13 @@ static int testCompareXMLToArgvFiles(const char *xml, conn->privateData =3D &driver; =20 cmd =3D virBhyveProcessBuildBhyveCmd(conn, vmdef, false); - ldcmd =3D virBhyveProcessBuildLoadCmd(conn, vmdef, "", + if (!vmdef->os.loader) + ldcmd =3D virBhyveProcessBuildLoadCmd(conn, vmdef, "", &actualdm); =20 + if ((ldcmd =3D=3D NULL) && (vmdef->os.loader)) + ldcmd =3D virCommandNew("dummy"); + if ((cmd =3D=3D NULL) || (ldcmd =3D=3D NULL)) { if (flags & FLAG_EXPECT_FAILURE) { ret =3D 0; @@ -162,7 +166,8 @@ mymain(void) DO_TEST_FULL(name, FLAG_EXPECT_PARSE_ERROR) =20 driver.grubcaps =3D BHYVE_GRUB_CAP_CONSDEV; - driver.bhyvecaps =3D BHYVE_CAP_RTC_UTC | BHYVE_CAP_AHCI32SLOT | BHYVE_= CAP_NET_E1000; + driver.bhyvecaps =3D BHYVE_CAP_RTC_UTC | BHYVE_CAP_AHCI32SLOT | \ + BHYVE_CAP_NET_E1000 | BHYVE_CAP_LPC_BOOTROM; =20 DO_TEST("base"); DO_TEST("acpiapic"); @@ -186,6 +191,7 @@ mymain(void) DO_TEST("serial-grub"); DO_TEST("localtime"); DO_TEST("net-e1000"); + DO_TEST("uefi"); =20 /* Address allocation tests */ DO_TEST("addr-single-sata-disk"); @@ -208,6 +214,9 @@ mymain(void) =20 DO_TEST_FAILURE("net-e1000"); =20 + driver.bhyvecaps &=3D ~BHYVE_CAP_LPC_BOOTROM; + DO_TEST_FAILURE("uefi"); + virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); =20 --=20 2.11.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list