From patchwork Tue Mar 23 16:53:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 12158865 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D206EC433DB for ; Tue, 23 Mar 2021 17:22:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5409D61924 for ; Tue, 23 Mar 2021 17:22:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5409D61924 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOkjO-0004P4-AJ for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 13:22:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkMu-00074Q-Ve for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:59:00 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]:46796) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkMq-0005xj-8J for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:58:59 -0400 Received: by mail-ed1-x52c.google.com with SMTP id h10so24234787edt.13 for ; Tue, 23 Mar 2021 09:58:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T09JXAieuC5lCz4KQSw0Px8wxRw9/FqpVz/R+u05gxY=; b=z1MpINiRSk4AwL/JUncs8zimG1TLpfINyPnFiuKvEoZzVAY5DvR60wn2pQ9Qdp99Z5 3Km3C9JLVChul/6dmC7dVRPpf5fogzeYG+OBVLeJrHo+DAgsypuBb7k6nE57iwvVS5La 96FfoDnRZ2ZNf3WBJId+SBZud1I0KS2vKoAu9/UuNz+VS0izL56mNMVNza2FH1hWFTmb p3IE7OaSfiomh4P4zbKO/g/TW5wvaB+MiPRJs1LSOweLMUUK1giufVI/Cd37v0XIo7HX 2tLKrFWKS5vxRQ8F6pEtkiHs+wqYgOB+srrwBuh8zM62gUvEos+aZbFs5CqSSEbRGrlB IsPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T09JXAieuC5lCz4KQSw0Px8wxRw9/FqpVz/R+u05gxY=; b=AoavR/6aa95bE/tmfGch21E6Fy6wJ1FA3tnDJMVQYLWiY0vJi53mKyWzckrM8/CFZD OI6M7nJOxg5mcPH3EfPkr5XRqklXIueU+AbVIbu6mDkx3PmAIpplPbBl0TH1v9V3yGRw enuHfYrPtE43sBaSjqScC0vNqDBBx0pEEZBy7osFeyG+4ok5OixIRXm9EE4KP5ZPAWUS atb5UuwguZp0KR63CuyYRdOnGDUwxQWMiNPmkqhhfkrUjTmjGsO2tM4tex3h7BfMRWev hozGLH/y5T77WEOxn1W2VFDOFwaA/eEi0hnhY/cQZu7mimo3rANe6PtotGoHd/fJ9LVJ nl6A== X-Gm-Message-State: AOAM533OrTWg+Ud5OyezkDP2s7Ye0wnFSfrM+haasa68JeIvKFgJgTEd OYWqrWEcvV5Th4qXrJwrcHPlqw== X-Google-Smtp-Source: ABdhPJx30o/ooB5BJXgBH6aaJjsS3E03zG2a74gIMCZertpcMTsjNBY9TEG3MkElY5uDAQNZ97V05Q== X-Received: by 2002:aa7:c550:: with SMTP id s16mr5550235edr.98.1616518734541; Tue, 23 Mar 2021 09:58:54 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u15sm13340888eds.6.2021.03.23.09.58.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:58:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1A0BC1FF9F; Tue, 23 Mar 2021 16:53:12 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 18/22] blockdev: with -drive if=virtio, use generic virtio-blk Date: Tue, 23 Mar 2021 16:53:04 +0000 Message-Id: <20210323165308.15244-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-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 , "open list:Block layer core" , =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= , Laurent Vivier , Max Reitz , =?utf-8?q?Alex_Benn=C3=A9e?= , Markus Armbruster Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Laurent Vivier 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. Signed-off-by: Laurent Vivier Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Acked-by: Markus Armbruster Message-Id: <20210319202335.2397060-4-laurent@vivier.eu> Signed-off-by: Alex Bennée --- blockdev.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/blockdev.c b/blockdev.c index cf70bb4e43..413aacf604 100644 --- a/blockdev.c +++ b/blockdev.c @@ -962,11 +962,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type, QemuOpts *devopts; devopts = qemu_opts_create(qemu_find_opts("device"), NULL, 0, &error_abort); - if (arch_type == 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); }