From patchwork Mon Jun 26 18:01:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 106377 Delivered-To: patch@linaro.org Received: by 10.140.101.48 with SMTP id t45csp282634qge; Mon, 26 Jun 2017 11:09:32 -0700 (PDT) X-Received: by 10.200.40.91 with SMTP id 27mr2081459qtr.37.1498500572842; Mon, 26 Jun 2017 11:09:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498500572; cv=none; d=google.com; s=arc-20160816; b=nhC6b3ufRmKalNapiWXRXELYZAXOOp82hqbbjB1y1VhXl7I5yDQ9TocvR6oooDo8cb 1j9jJJHPKYnMsfA4lrG0pJ/mHA9W33dQWxvtX8DC87iyfbHrniiCw8roIf8pJw2zM5xM YEgvtRPcd6Bq/XBoMh1d9/g6/XAI+YYSNxALrb/ukb2/hehCsLaZkqUGVy49IJNvNglw K0B/zURoqZMLUAsGbfRDDnZ+nf/in6Pxi/9wvsqptGtTJWbs31OQU2SHucJ2qyXX17Jl hU1rbzyr74KR9twkALb/iOhRiGxcPkzBiatrKZ2X1LZ/xEhviVw67Abx90Fa8qs900Ps G6KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:references :in-reply-to:message-id:date:to:from:delivered-to:dkim-filter :dmarc-filter:arc-authentication-results; bh=6gPCKxtGul1C++vkmKvQW7qojz4+uSb5S4m34q5krz4=; b=So2Aj4UHucovDsdEMQBz5Kdo4tgIMEBVV8f5Q+tPatCbeZkX/ZwtICz0ne0nPP3mhU ZVIMvVOQhFxlnL/50SoWml/BKLjpUUyeL9lcej5+dTbivTaw8vfT6F8CIAPlHDNi/o2M lh9OuDGFoc6uON6UW3xPg/r3aArpcW4OuzFHqt1rHshNPx848YHBxnHHabsu76EgwgcO pNk9Z4B5ukcCc4H/HmOoH6k2a5W6zfPChTlAq1vGzjryzse+XRWqP1kImFj1CMfvo7ec 1fFHnvXSBRLmh//JRuGV4F26BRXiAf9+FxZlgRlhgoxm+8H/e+Aj5WDPxqq9Y1ND0UOD Agdg== 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 m67si612709qkd.343.2017.06.26.11.09.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jun 2017 11:09:32 -0700 (PDT) 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 58D4A8124F; Mon, 26 Jun 2017 18:09:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 58D4A8124F Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 58D4A8124F 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 024E55C461; Mon, 26 Jun 2017 18:09:31 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 10AC01853E30; Mon, 26 Jun 2017 18:09:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v5QI3GIR008116 for ; Mon, 26 Jun 2017 14:03:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 11EC97E48D; Mon, 26 Jun 2017 18:03:16 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from worklaptop.redhat.com (ovpn-117-115.phx2.redhat.com [10.3.117.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id 74CDA78436; Mon, 26 Jun 2017 18:03:06 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 26 Jun 2017 14:01:50 -0400 Message-Id: <3bb6137034fc7244adb85bded7ed0b4421b02c13.1498499391.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: cdall@linaro.org, drjones@redhat.com, riku.voipio@linaro.org, Andrea Bolognani Subject: [libvirt] [PATCH 09/12] tests: qemuxml2argv: Add some QEMU_CAPS_CHARDEV annotations 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 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.25]); Mon, 26 Jun 2017 18:09:32 +0000 (UTC) Several tests are intending to test some serial/console related bits but aren't setting QEMU_CAPS_CHARDEV. This will soon be enabled unconditionally so let's add it ahead of time. * q35-virt-manager-basic: Intended to test a virt-manager q35 config, which will include a serial/console device * console-compat*: console/serial XML compat handling * bios: Needs a serial device for sgabios CLI Signed-off-by: Cole Robinson --- tests/qemuxml2argvdata/qemuxml2argv-bios.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-console-compat.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args | 3 ++- tests/qemuxml2argvtest.c | 7 ++++--- 5 files changed, 12 insertions(+), 7 deletions(-) -- 2.13.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Andrea Bolognani diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.args b/tests/qemuxml2argvdata/qemuxml2argv-bios.args index 6f4d66de4..048d4ff96 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.args @@ -23,6 +23,7 @@ server,nowait \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --serial pty \ +-chardev pty,id=charserial0 \ +-device isa-serial,chardev=charserial0,id=serial0 \ -device usb-tablet,id=input0,bus=usb.0,port=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args index 5b2673367..cab47dbb5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args @@ -21,5 +21,6 @@ server,nowait \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --serial pty \ +-chardev pty,id=charserial0 \ +-device isa-serial,chardev=charserial0,id=serial0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args index be3ed2e30..fb96946f1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args @@ -21,4 +21,5 @@ server,nowait \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --serial pty +-chardev pty,id=charserial0 \ +-device isa-serial,chardev=charserial0,id=serial0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args b/tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args index 0d659590c..96d2ae592 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args @@ -37,7 +37,8 @@ id=virtio-disk0 \ -netdev user,id=hostnet0 \ -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:9a:e6:c6,bus=pci.1,\ addr=0x0 \ --serial pty \ +-chardev pty,id=charserial0 \ +-device isa-serial,chardev=charserial0,id=serial0 \ -chardev socket,id=charchannel0,\ path=/tmp/channel/domain--1-virt-manager-basic/org.qemu.guest_agent.0,server,\ nowait \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 2b81f9917..626aebfed 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -739,7 +739,7 @@ mymain(void) DO_TEST("reboot-timeout-enabled", QEMU_CAPS_REBOOT_TIMEOUT); DO_TEST_FAILURE("reboot-timeout-enabled", NONE); - DO_TEST("bios", QEMU_CAPS_SGA); + DO_TEST("bios", QEMU_CAPS_SGA, QEMU_CAPS_CHARDEV); DO_TEST("bios-nvram", NONE); DO_TEST("bios-nvram-secure", QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, @@ -1177,8 +1177,8 @@ mymain(void) QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEPORT); DO_TEST("serial-spiceport-nospice", NONE); - DO_TEST("console-compat", NONE); - DO_TEST("console-compat-auto", NONE); + DO_TEST("console-compat", QEMU_CAPS_CHARDEV); + DO_TEST("console-compat-auto", QEMU_CAPS_CHARDEV); DO_TEST("serial-vc-chardev", QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); @@ -2001,6 +2001,7 @@ mymain(void) QEMU_CAPS_DEVICE_VIDEO_PRIMARY); DO_TEST("q35-virt-manager-basic", QEMU_CAPS_KVM, + QEMU_CAPS_CHARDEV, QEMU_CAPS_RTC, QEMU_CAPS_ICH9_DISABLE_S3, QEMU_CAPS_ICH9_DISABLE_S4,