From patchwork Thu Jun 4 16:20:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 49534 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 64DF32154F for ; Thu, 4 Jun 2015 16:21:01 +0000 (UTC) Received: by lani11 with SMTP id i11sf13009241lan.3 for ; Thu, 04 Jun 2015 09:21:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=FyTpWwZ/CQZeQi+f9KIx/xR/9sfxRLdhEfr1fXSwlIA=; b=Gv0XqI/7A+iENveGC7OY3yv9gEPpX41EPLyohgYCydsPWflmlAWl4RR31I1fKAwnQL ayztxUk9NBXrrOJU67/4dVUPfgpnWWsF/en0GvO1Nt/OxANMvvYZt1ogFA8PWB0Q0Zh8 wFu6sN1IJZUJxis+EHpWwrjUZ1KDEH+MFoM94zRVsZZ6dCPYLjPVNf1r7iFwh0Gn/OQB o+JVcZfq14IYRVdDNnCAw0xIaFC2GMJ15A0nutA5HJZJWhr+ZyXV6NCvzOGslRwlFKp/ llxxHD0D/Fp1w8bAxfCrXcOqYdsk+M1KD9eiVY1XZr+qtmizzymrc3X8ODIJFZt5mPNo rGdA== X-Gm-Message-State: ALoCoQnlHCro6kMYAbJZMEiyOBTiJiAcj6nueEJH3/EecAmwmuh2/CiawZ6pCHaVMC8GDgIwVACA X-Received: by 10.112.162.228 with SMTP id yd4mr35986740lbb.8.1433434860415; Thu, 04 Jun 2015 09:21:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.42.206 with SMTP id q14ls206933lal.58.gmail; Thu, 04 Jun 2015 09:21:00 -0700 (PDT) X-Received: by 10.112.140.231 with SMTP id rj7mr38092997lbb.76.1433434860278; Thu, 04 Jun 2015 09:21:00 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id w5si2258169laj.65.2015.06.04.09.21.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jun 2015 09:21:00 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by lbbtu8 with SMTP id tu8so14488646lbb.2 for ; Thu, 04 Jun 2015 09:21:00 -0700 (PDT) X-Received: by 10.112.220.7 with SMTP id ps7mr37816007lbc.72.1433434860159; Thu, 04 Jun 2015 09:21:00 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp729090lbb; Thu, 4 Jun 2015 09:20:59 -0700 (PDT) X-Received: by 10.152.36.227 with SMTP id t3mr39595284laj.12.1433434856707; Thu, 04 Jun 2015 09:20:56 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id v6si2258027lav.62.2015.06.04.09.20.56 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 04 Jun 2015 09:20:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::1 as permitted sender) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Z0Xt0-00050s-08; Thu, 04 Jun 2015 17:20:54 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Markus Armbruster , Kevin Wolf , qemu-block@nongnu.org, Christian Borntraeger , Cornelia Huck , Alexander Graf Subject: [PATCH 4/4] hw/arm/virt: Make block devices default to virtio Date: Thu, 4 Jun 2015 17:20:53 +0100 Message-Id: <1433434853-19229-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1433434853-19229-1-git-send-email-peter.maydell@linaro.org> References: <1433434853-19229-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Now we have virtio-pci, we can make the virt board's default block device type be IF_VIRTIO. This allows users to use simplified command lines that don't have to explicitly create virtio-pci-blk devices; the -hda &c very short options now also work. Signed-off-by: Peter Maydell --- hw/arm/virt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 0a75cc8..14afe86 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -961,6 +961,7 @@ static void virt_class_init(ObjectClass *oc, void *data) mc->init = machvirt_init; mc->max_cpus = 8; mc->has_dynamic_sysbus = true; + mc->block_default_type = IF_VIRTIO; } static const TypeInfo machvirt_info = {