From patchwork Wed Jan 23 21:32:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 156403 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1201557jaa; Wed, 23 Jan 2019 13:33:37 -0800 (PST) X-Google-Smtp-Source: ALg8bN7/j9/upf9TMTTW4n7fcZcQcg/4WcXYDrELitz1/TOdaOdbVYVTJMRYYFhog/wUWZ5AgFqt X-Received: by 2002:ae9:c106:: with SMTP id z6mr3335384qki.197.1548279217329; Wed, 23 Jan 2019 13:33:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548279217; cv=none; d=google.com; s=arc-20160816; b=H2n+k2Pi8bu0pcv65kYG50SOYLXnIebKJ/JhI5dCCwAqu62jUrNFCnJCBao5bLA75j XKqtZZ24uXXCbFr+gtO1hNv1ZGLXkvhsZBmz6/1dPT1vc4WAAjLfCYkbFvL2vIopZi5F gHc5u/pjEDvJvWW0RunpUytSJv7fqA//Dt973f8732IgHKtaJeW0Bre/kWzyZJabOahc 8dOJhNPNNByExbWKUZNfnxAiqOVrTSJ6eVZNopEFON7vJhU21DZXbWYKKDEC3aTmeaB4 DwowD/UPK+iOPtARKA/BOS25VqvkmT4+bzGOPmsO2dZZSO1zqS5Psn8LKjgR5BJOiCmO dqYA== 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=F8Xf77iFqbysLyWw277x9CKI46DMmdYyGbTl1T7Vwdg=; b=ZX3QTWMlPTSrBdDZBQeNNcE0KQIMmxU684RPPBLaFughT+a06l+HxTYNmv+QoqBMmS kBAECd6jz3eoVp0unZMC/3ENtUnk8MufXKCzN6y46qwFTEhfKb29eGYU/Qq9VBnrjtIn ZuZBMiuNT6dOZDMptU5dD2rAT+xvAbVF54CNl64PYx52kz8HtwBBVM0WT1KyFExcv2fZ 3fxjwcZ/7i8Oe1x7ymT0KdzddhE+XW8+ovq+i4m3LSqRBEX4J+66tFnNV37qSbkQHUmI g+Mm8/dHV8rCt77qOLPX3Y+Qzu0aLblhrYt7n0FbGQiBTFhmDneQO9+TTbWcVGAq5nep tT2Q== 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 d197si3301622qkb.84.2019.01.23.13.33.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Jan 2019 13:33:37 -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-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 023532CD814; Wed, 23 Jan 2019 21:33:36 +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 C43EF1048104; Wed, 23 Jan 2019 21:33:35 +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 7769D18033A1; Wed, 23 Jan 2019 21:33:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x0NLXJD7032282 for ; Wed, 23 Jan 2019 16:33:19 -0500 Received: by smtp.corp.redhat.com (Postfix) id EC9AEBA8B; Wed, 23 Jan 2019 21:33:19 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-120-34.rdu2.redhat.com [10.10.120.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20C5CBA50; Wed, 23 Jan 2019 21:33:19 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Wed, 23 Jan 2019 16:32:33 -0500 Message-Id: <31eaef0e389c7a33846a473fcf6b0676961b530a.1548278585.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 05/25] qemu: command: Make vhost-scsi device string depend on address 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.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 23 Jan 2019 21:33:36 +0000 (UTC) The vhost-scsi device string should depend on the requested address type, not strictly on the emulated arch. This is the same logic used by qemuBuildVirtioDevStr, and this particular path is already tested in the hostdev-scsi-vhost-scsi-ccw tests Signed-off-by: Cole Robinson --- src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 -- 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 bbc85e75f0..a1d991cefc 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4925,7 +4925,7 @@ qemuBuildSCSIVHostHostdevDevStr(const virDomainDef *def, goto cleanup; } - if (ARCH_IS_S390(def->os.arch)) + if (dev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) virBufferAddLit(&buf, "vhost-scsi-ccw"); else virBufferAddLit(&buf, "vhost-scsi-pci");