From nobody Tue Feb 10 02:00:28 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1616185726; cv=none; d=zohomail.com; s=zohoarc; b=HKv+rUCmgEAyNU4v318KTENvDqWWGu9u/ICXf4vJQXxtrFWgkNyazDYXX8DMGQU4BoCdgv9+faxRcUpUJzm/T+JpYKJEIqSDVk+0Plm3ra2qiYEesJbJRrJk4kkT0FQXtjm8z1rty6o5vQxLcryJ3NsPywoIiXgHnG7Y07DDoSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616185726; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7kTEnJqYtrDSIARGFGyjHosSMU0ZgbqXGAEpV3CtTpQ=; b=BIQNqxVV2+5PG+iBiBhcT3LAD2vAmhQfC9+Dd+AJbRGorqO60SP64akqp66AhSaFsWyNMP6WDL1l/kFDpZ5kmIVXIDz8EH3FJMaGWfaHD5FmdwnrxQlHPmkiWFMbCd54Di9lQZjAiFM3W4E/1cSo/BIphzvpuqg9dG3T79gO4+o= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616185726634332.0431914432784; Fri, 19 Mar 2021 13:28:46 -0700 (PDT) Received: from localhost ([::1]:54970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lNLjd-0002Nb-4K for importer@patchew.org; Fri, 19 Mar 2021 16:28:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNLf8-0004yE-If; Fri, 19 Mar 2021 16:24:02 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:53075) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNLew-0001P0-DC; Fri, 19 Mar 2021 16:24:02 -0400 Received: from localhost.localdomain ([82.142.20.38]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MTzrW-1lFChw0gNe-00R27x; Fri, 19 Mar 2021 21:23:42 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v3 3/6] blockdev: with -drive if=virtio, use generic virtio-blk Date: Fri, 19 Mar 2021 21:23:32 +0100 Message-Id: <20210319202335.2397060-4-laurent@vivier.eu> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210319202335.2397060-1-laurent@vivier.eu> References: <20210319202335.2397060-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:Gc7NCjRrRa6oWoAW/nGwf8xXfOoQ0ApvqYEedBxhtkfqS7Ez+c9 mluwsdF8+K0PmxtJIZUa5ODXloVVpcxh5wyiZYJ+SJeliiW86ws6xgqaSWhZGPD4ALruVZh qvRx93eH9gEVRwpWgjHzX683aNDQOspS9pD8iQJXkmc1d5pMxOnsIK0TfYSlbtI4WAtgKee a/GXIsEU9eCd5NtBhpnIA== X-UI-Out-Filterresults: notjunk:1;V03:K0:C2fVXyWp98Q=:F6y7gkWYgNb0MukgqMbbge kRWUGlPRlpu1CrkT4f3XqK0T+LfeuP9o8RfPrTSr0TgO1cSTjwXXohfQnOcNXqaFHsZksjJMw yiq3oeX3/htn9rg4jqNJg8KY+1y7pxGTx4uPAgoem6WKUACERDumD9GLL38fl4yIVY5C2r8tT NH0hzW1yuPhfQCyU8HbMB7Dnw/7Ta7y9a/ETYMeURRJHsHMJQytin9PdHPfF3OVcEpWHVZ3z2 BJOQaD02Bfp5oRc2+BEBH5wwZekkTbHcHkCxgajlFQl1+v3kXYdzU8wy0dj3IGQ1ecqtwgM4Q a5n0PMktNp00ORtYJ46o+uljkk0XY1IjPxOYZr1ELzYS7A9UMSYthOczT/hFETREr7bCyG+Pb OPQaBb2GAWxtOOTJVy7WzsJB0MH3ZSJndRaGQ/adnS7qQYkWDrjssTGVx69gj1rQpd2if9VRM Gz4ZodReZA== Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , qemu-block@nongnu.org, Cornelia Huck , Markus Armbruster , Max Reitz , qemu-s390x@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Rather than checking if the machine is an s390x to use virtio-blk-ccw instead of virtio-blk-pci, use the alias virtio-blk that is set to the expected target. This also enables the use of virtio-blk-device for targets without PCI or CCW. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Laurent Vivier Acked-by: Markus Armbruster --- blockdev.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/blockdev.c b/blockdev.c index 5cc7c7effe9f..64da5350e3ad 100644 --- a/blockdev.c +++ b/blockdev.c @@ -969,11 +969,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfac= eType block_default_type, QemuOpts *devopts; devopts =3D qemu_opts_create(qemu_find_opts("device"), NULL, 0, &error_abort); - if (arch_type =3D=3D QEMU_ARCH_S390X) { - qemu_opt_set(devopts, "driver", "virtio-blk-ccw", &error_abort= ); - } else { - qemu_opt_set(devopts, "driver", "virtio-blk-pci", &error_abort= ); - } + qemu_opt_set(devopts, "driver", "virtio-blk", &error_abort); qemu_opt_set(devopts, "drive", qdict_get_str(bs_opts, "id"), &error_abort); } --=20 2.30.2