From patchwork Fri Feb 8 22:47:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 157892 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp27880jaa; Fri, 8 Feb 2019 14:47:40 -0800 (PST) X-Google-Smtp-Source: AHgI3IYNp3iCVw3gDWUPVprXtFEUCFXQOD9gU2nY2xLk9ArISQAYpTeKyN0RXSUVfkTmmM6uIUnI X-Received: by 2002:ac8:2d0b:: with SMTP id n11mr7917381qta.143.1549666060230; Fri, 08 Feb 2019 14:47:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549666060; cv=none; d=google.com; s=arc-20160816; b=NoNBASmUMY6//Xbih8ma2ieFu4savhxKXjVo4K6rcuUtehIKPgnNk4JMGbqs+W05PB 8MRh176bE7KJGy2R87qHS2sH2Nb7mCGYmrLYQBMmjUgQRFc2XnMPQ0NK8RvI3isSt4lS 6VWaHut4N/+lrnaFNbPkLMcyGmknRMKssZO+D8DPbDduXneo0XzDpfl+dKV1Mi/qc52Q nxmZrxMX/zttaQGf6hgCCYDp0JVm1lfd2QY3IcBZm/dCTRKfVpbuEB5ORqujIyZEA63I 7HX3FDxnYUJ7uj6d5UCRx6WpHU8hgWc3kbPdSusFqjA43Y4Zr5b7tgIglVW6GT4Qr11I BbqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :delivered-to; bh=wAij8taKtXMRldeQg4LLI6TZUmUQ73fX2bwiG9/bxjM=; b=0FPFGWeDYM73J8XaUJsaWoOXagJ6aFemQYNzFiHSHJcrXm8ZAa0LftZIY+UzWCuvhm v5m0qCvZxlYU6hK65hpAHKkX9+oICKSmlifi16zWsSci30t1aGXqhZd0DmeCOGga/Lje z6YRfrGUgpXh4nYEuan26uUY+suJIqS8/ba6fORz0qU3GnK9T2BZ2hHcePUrgwYRWUoq j5uA44rY7KAJDfPWewDfzwuasdMLAr/zR5VTzihv2eW97okLFV7FOuJHErFKx+x2viiR Lz+nRZIgb8WHi51ldmcKP36lZh9E72pagqKxUnlUGKzeMMntghiIdwF4pcqsDnCs19+F oFaQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id j43si1283184qtc.381.2019.02.08.14.47.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Feb 2019 14:47:40 -0800 (PST) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com 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 mx1.redhat.com (Postfix) with ESMTPS id 5396D2CE90B; Fri, 8 Feb 2019 22:47:38 +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 07FA0D1F1; Fri, 8 Feb 2019 22:47:38 +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 69D52180BAAC; Fri, 8 Feb 2019 22:47:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x18MlM8U014285 for ; Fri, 8 Feb 2019 17:47:22 -0500 Received: by smtp.corp.redhat.com (Postfix) id 95A0554505; Fri, 8 Feb 2019 22:47:22 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-123-115.rdu2.redhat.com [10.10.123.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id 324E55B682; Fri, 8 Feb 2019 22:47:22 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Fri, 8 Feb 2019 17:47:13 -0500 Message-Id: <50dc261aff36c57d0d086eb0fa043393ed169d8f.1549665763.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/4] tests: domcaps: Remove dependency on libxl PVUSB support X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 08 Feb 2019 22:47:39 +0000 (UTC) Mock out libxlCapsHasPVUSB to always return true, so test results aren't dependent on host libxl version Signed-off-by: Cole Robinson --- tests/domaincapsmock.c | 11 +++ .../domaincapsschemadata/libxl-xenfv-usb.xml | 78 ------------------- tests/domaincapsschemadata/libxl-xenfv.xml | 1 + .../domaincapsschemadata/libxl-xenpv-usb.xml | 68 ---------------- tests/domaincapsschemadata/libxl-xenpv.xml | 1 + tests/domaincapstest.c | 12 +-- 6 files changed, 15 insertions(+), 156 deletions(-) delete mode 100644 tests/domaincapsschemadata/libxl-xenfv-usb.xml delete mode 100644 tests/domaincapsschemadata/libxl-xenpv-usb.xml -- 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/tests/domaincapsmock.c b/tests/domaincapsmock.c index d8cf61685e..90e17c19f0 100644 --- a/tests/domaincapsmock.c +++ b/tests/domaincapsmock.c @@ -17,6 +17,17 @@ #include #include "virhostcpu.h" +#ifdef WITH_LIBXL +# include "libxl/libxl_capabilities.h" +#endif + +#ifdef WITH_LIBXL +bool +libxlCapsHasPVUSB(void) +{ + return true; +} +#endif int virHostCPUGetKVMMaxVCPUs(void) diff --git a/tests/domaincapsschemadata/libxl-xenfv-usb.xml b/tests/domaincapsschemadata/libxl-xenfv-usb.xml deleted file mode 100644 index 29fe1f9aa3..0000000000 --- a/tests/domaincapsschemadata/libxl-xenfv-usb.xml +++ /dev/null @@ -1,78 +0,0 @@ - - /usr/bin/qemu-system-x86_64 - xen - xenfv - x86_64 - - - - - /usr/lib/xen/boot/hvmloader - /usr/lib/xen/boot/ovmf.bin - - rom - pflash - - - yes - - - - - - - - - - - - disk - cdrom - - - ide - scsi - xen - - - - - sdl - vnc - spice - - - - - - subsystem - - - default - mandatory - requisite - optional - - - usb - pci - - - - xen - - - - - - - - - - diff --git a/tests/domaincapsschemadata/libxl-xenfv.xml b/tests/domaincapsschemadata/libxl-xenfv.xml index 5f318d5c4b..29fe1f9aa3 100644 --- a/tests/domaincapsschemadata/libxl-xenfv.xml +++ b/tests/domaincapsschemadata/libxl-xenfv.xml @@ -60,6 +60,7 @@ optional + usb pci diff --git a/tests/domaincapsschemadata/libxl-xenpv-usb.xml b/tests/domaincapsschemadata/libxl-xenpv-usb.xml deleted file mode 100644 index b9f3ca736b..0000000000 --- a/tests/domaincapsschemadata/libxl-xenpv-usb.xml +++ /dev/null @@ -1,68 +0,0 @@ - - /usr/bin/qemu-system-x86_64 - xen - xenpv - x86_64 - - - - - - - - - - - - - - disk - cdrom - - - ide - scsi - xen - - - - - sdl - vnc - spice - - - - - - subsystem - - - default - mandatory - requisite - optional - - - usb - pci - - - - xen - - - - - - - - - - diff --git a/tests/domaincapsschemadata/libxl-xenpv.xml b/tests/domaincapsschemadata/libxl-xenpv.xml index 6fc65f67b7..b9f3ca736b 100644 --- a/tests/domaincapsschemadata/libxl-xenpv.xml +++ b/tests/domaincapsschemadata/libxl-xenpv.xml @@ -50,6 +50,7 @@ optional + usb pci diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 7f52058bad..b9ab148fab 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -508,17 +508,9 @@ mymain(void) #if WITH_LIBXL -# ifdef LIBXL_HAVE_PVUSB -# define LIBXL_XENPV_CAPS "libxl-xenpv-usb" -# define LIBXL_XENFV_CAPS "libxl-xenfv-usb" -# else -# define LIBXL_XENPV_CAPS "libxl-xenpv" -# define LIBXL_XENFV_CAPS "libxl-xenfv" -# endif - - DO_TEST_LIBXL(LIBXL_XENPV_CAPS, "/usr/bin/qemu-system-x86_64", + DO_TEST_LIBXL("libxl-xenpv", "/usr/bin/qemu-system-x86_64", "xenpv", "x86_64", VIR_DOMAIN_VIRT_XEN); - DO_TEST_LIBXL(LIBXL_XENFV_CAPS, "/usr/bin/qemu-system-x86_64", + DO_TEST_LIBXL("libxl-xenfv", "/usr/bin/qemu-system-x86_64", "xenfv", "x86_64", VIR_DOMAIN_VIRT_XEN); #endif /* WITH_LIBXL */