From patchwork Mon Jun 26 18:01:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 106376 Delivered-To: patch@linaro.org Received: by 10.140.101.48 with SMTP id t45csp282516qge; Mon, 26 Jun 2017 11:09:26 -0700 (PDT) X-Received: by 10.233.221.70 with SMTP id r67mr1842131qkf.81.1498500566391; Mon, 26 Jun 2017 11:09:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498500566; cv=none; d=google.com; s=arc-20160816; b=zY9WAcqyAHAQebfVQ5JcH7f4btC63WkUYJB5yRJXL7tsL40gen/ZOBU4hWtgPCjg77 X5VPwRz/uJkatxP1WmsehxXxNQ2WIg6yX8W6EqwK4GWzGQCuEIhdkLQiZM6G/KA+Soon IkPXTAMi79kgKbHVlnI7+TSJXk5Q3/nxYJxvrW6B3YWJDSKeMRxvRJbVp09gHB1pSfhH 8mF2r8Tj5ohvWZp22ke+kcpS/1xDPN+6glVCsV3rOw26t507y5whekRmqcAovMEceAhG QG4Zuo77MTI7cyZiM+XSdfLNpBkg4J+qUvJ+O32xPptZ0Oi4GTX4xuV61i/uiQYOpyrd NXWQ== 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=P/u+nEfOvzNsnGumQ6DrCslT/B9boG1WHqirMTx5Cl8=; b=NMvr6IlXH1ZN4E/zQxvdCpShuVf8n+eBtXcrutn+sd9bakLLfMX0DylDdx3FR7TvIv Ii7yTXDUxtluw9VM13Chy4WYWAmeJURSvhcg07CyIeATzwa3JrR41MKXp5nbE5CveuF1 y8TyBwFXJJFP1b1rfNoKROS3HZX3b0wQ4jFLN6r+GStCSey3eDfbVZ10EQXNO0Q03z1A ZE5IJ+XSLsmc3EJk3NC7xvRzsj6bic0XqBObjWqY6288H3kDMZzVpf0StbM+S2f8Kuoy rpxvEu84J+NjgDMikVl5LBIWtscP1SIOEIj2nW7EC4uoV2Ia2FjcNiloquPyLS+7tair YNTg== 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 g7si603859qkb.287.2017.06.26.11.09.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jun 2017 11:09:26 -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 D047B80C0A; Mon, 26 Jun 2017 18:09:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D047B80C0A Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.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 D047B80C0A 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 AA4107EE89; Mon, 26 Jun 2017 18:09:24 +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 4EFF21853E31; Mon, 26 Jun 2017 18:09:24 +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 v5QI26dL007901 for ; Mon, 26 Jun 2017 14:02:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id A78F878352; Mon, 26 Jun 2017 18:02:06 +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 5A78378396; Mon, 26 Jun 2017 18:02:05 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 26 Jun 2017 14:01:44 -0400 Message-Id: <7f54b32ba02a389cd28f3d859ae352f8de1c4df9.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 03/12] tests: qemuxml2argv: Add an aarch64 pci-serial test 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.26]); Mon, 26 Jun 2017 18:09:25 +0000 (UTC) This demonstrates that the previous qemu caps changes will use -chardev for pci-serial on aarch64 machvirt Signed-off-by: Cole Robinson --- .../qemuxml2argv-aarch64-pci-serial.args | 26 ++++++++++++++++++++++ .../qemuxml2argv-aarch64-pci-serial.xml | 17 ++++++++++++++ tests/qemuxml2argvtest.c | 7 ++++++ 3 files changed, 50 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-serial.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-serial.xml -- 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-aarch64-pci-serial.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-serial.args new file mode 100644 index 000000000..79153d2f4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-serial.args @@ -0,0 +1,26 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 \ +-name aarch64test \ +-S \ +-M virt \ +-m 1024 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \ +-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \ +-device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \ +-chardev pty,id=charserial0,logfile=/tmp/log,logappend=on \ +-device pci-serial,chardev=charserial0,id=serial0,bus=pci.2,addr=0x1 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-serial.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-serial.xml new file mode 100644 index 000000000..f3d04a2a5 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-serial.xml @@ -0,0 +1,17 @@ + + aarch64test + 496d7ea8-9739-544b-4ebd-ef08be936e8b + 1048576 + 1048576 + 1 + + hvm + + + /usr/bin/qemu-system-aarch64 + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 27eea70ae..b41c41a96 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2342,6 +2342,13 @@ mymain(void) DO_TEST_FAILURE("aarch64-kvm-32-on-64", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_KVM); + DO_TEST("aarch64-pci-serial", + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CHARDEV, + QEMU_CAPS_DEVICE_PCI_SERIAL, QEMU_CAPS_CHARDEV_LOGFILE, + QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_PCI_MULTIFUNCTION, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, + QEMU_CAPS_DEVICE_IOH3420); /* Make sure all combinations of ACPI and UEFI behave as expected */ DO_TEST("aarch64-acpi-uefi", NONE);