From patchwork Mon Jun 26 18:01:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 106369 Delivered-To: patch@linaro.org Received: by 10.140.101.48 with SMTP id t45csp274714qge; Mon, 26 Jun 2017 11:02:20 -0700 (PDT) X-Received: by 10.233.223.65 with SMTP id t62mr1991428qkf.80.1498500140065; Mon, 26 Jun 2017 11:02:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498500140; cv=none; d=google.com; s=arc-20160816; b=fcAYl48btWSgVDkdENWLvGRbuO0SiC7wgeExt1e/r+3JMiIRS3ZTeyCOm+s99DyLs7 3ePekIV3X6UsxHvlHElXbwiLg3QGkfpakd/kbVT6HJXjZ4tq7KmY59Fk9Io4SUrawdMn ieMDOqB78hJOwKeKnKwEcK39XKDYd7xPYsVfgaRFnzVjG0h8QHpuv2zIEFgnNgHALqf0 RrolDCPMUbL32D9nCBOYqjUGZCl4kb7jRnHqwE2HWZQsSKLeZxIVkxepQ3n+L7cmYNUH bzBeGCxkMQJs5VQK1cKjMW8Z7UQnSynWWqeqH5DJ3zKXrPVsNxHViMOAANiTTBzvsdNp FK3w== 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=QAfnAJBvvF3ol8+ZYEXkYBi6p+o636l4zm2uhs39oOI=; b=nOULtw0XQSXJYKJiUz0Bo6zzqWXyaZO8BfOpbytpQa4/MBqKIGfDm0nCo7XP8SNHyk vg0/GVdM+NYTI3DmCZX0qRyqhzlR7MsIDbzQijTxccy3jviuXbmjWQ9S8+/zQ07jC4/Q 8byud151ohqWmFbJlSaGem1jRY7kJxeQqWpXvyXFKd7V5AVIAt74CIxMAPhGJAhrZ6ey PAUf014+JfbGfCEy6h6JnnlndBjPH031+VRVnAW2sjgaO5pIYXTj2IBr4boU21JjJ97j ZmZfWqBuERSOSOedc3zNSvdQlHsFxDSKKn5ErmWDLwWB8OPyhkJOdrve0iPluM2RbEFL 2vmQ== 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 h2si609606qte.246.2017.06.26.11.02.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jun 2017 11:02:20 -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-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 mx1.redhat.com (Postfix) with ESMTPS id 804D07D0C3; Mon, 26 Jun 2017 18:02:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 804D07D0C3 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.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 804D07D0C3 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 46163784DB; Mon, 26 Jun 2017 18:02:18 +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 C01F51853E30; Mon, 26 Jun 2017 18:02:17 +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 v5QI28wB007909 for ; Mon, 26 Jun 2017 14:02:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1AF467E487; Mon, 26 Jun 2017 18:02:08 +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 D3BD47E46F; Mon, 26 Jun 2017 18:02:06 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 26 Jun 2017 14:01:45 -0400 Message-Id: <1d5aa426e2c7a8fcc4a18048ce26d5ad1d31a784.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 04/12] qemu: command: Remove old style -parallel building 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 26 Jun 2017 18:02:19 +0000 (UTC) AFAIK there aren't any qemu arch/machine types with platform parallel devices that would require old style -parallel config, so we shouldn't ever need this nowadays. Remove a now redundant test Signed-off-by: Cole Robinson --- src/qemu/qemu_command.c | 33 ++++++++------------ .../qemuxml2argv-parallel-tcp.args | 22 -------------- .../qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml | 35 ---------------------- tests/qemuxml2argvtest.c | 1 - tests/qemuxml2xmltest.c | 1 - 5 files changed, 12 insertions(+), 80 deletions(-) delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.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/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c53ab97b9..997d73d4b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9284,28 +9284,19 @@ qemuBuildParallelsCommandLine(virLogManagerPtr logManager, virDomainChrDefPtr parallel = def->parallels[i]; char *devstr; - /* Use -chardev with -device if they are available */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV)) { - if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, - parallel->source, - parallel->info.alias, - qemuCaps, true, - chardevStdioLogd))) - return -1; - virCommandAddArg(cmd, "-chardev"); - virCommandAddArg(cmd, devstr); - VIR_FREE(devstr); + if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, + parallel->source, + parallel->info.alias, + qemuCaps, true, + chardevStdioLogd))) + return -1; + virCommandAddArg(cmd, "-chardev"); + virCommandAddArg(cmd, devstr); + VIR_FREE(devstr); - if (qemuBuildChrDeviceCommandLine(cmd, def, parallel, - qemuCaps) < 0) - return -1; - } else { - virCommandAddArg(cmd, "-parallel"); - if (!(devstr = qemuBuildChrArgStr(parallel->source, NULL))) - return -1; - virCommandAddArg(cmd, devstr); - VIR_FREE(devstr); - } + if (qemuBuildChrDeviceCommandLine(cmd, def, parallel, + qemuCaps) < 0) + return -1; } return 0; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args deleted file mode 100644 index 22d551fd8..000000000 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args +++ /dev/null @@ -1,22 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --M pc \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ --boot c \ --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 \ --parallel tcp:127.0.0.1:9999,server,nowait diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml deleted file mode 100644 index 705e8c3c1..000000000 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml +++ /dev/null @@ -1,35 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - - - - - - - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b41c41a96..3610c71bf 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1186,7 +1186,6 @@ mymain(void) QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEPORT); DO_TEST("serial-spiceport-nospice", NONE); - DO_TEST("parallel-tcp", NONE); DO_TEST("console-compat", NONE); DO_TEST("console-compat-auto", NONE); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 13072996c..dd4cc2452 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -549,7 +549,6 @@ mymain(void) DO_TEST("serial-many", NONE); DO_TEST("serial-spiceport", NONE); DO_TEST("serial-spiceport-nospice", NONE); - DO_TEST("parallel-tcp", NONE); DO_TEST("console-compat", NONE); DO_TEST("console-compat2", NONE); DO_TEST("console-virtio-many", NONE);