Message ID | 1433872103-30642-4-git-send-email-peter.maydell@linaro.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <patchwork-forward+bncBC6Z756YVMIBBXGR3SVQKGQETVNKX3Y@linaro.org> 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 33868245D4 for <linaro@patches.linaro.org>; Tue, 9 Jun 2015 17:56:46 +0000 (UTC) Received: by laboh3 with SMTP id oh3sf6663783lab.0 for <linaro@patches.linaro.org>; Tue, 09 Jun 2015 10:56:44 -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=LvTh+7Mnleb8nrIogEI0VnMc3YUVIo3xItMFO0WGL/o=; b=mOyLGLr5kiK72EyLsmgmDEzPi7yXm8FiVBTv7z0za1q6l/2BHb0mb5x9kizqZDU59/ vB/a6pOYD/Z5ETXIKVW9tkU7igrGpBd6kVttHSiQOyTHalD4aIMx9YDHzpY/Q27XrVJo EO9hPcNA8t87jbHIZF75YHX3uzEkf6op73L7eaS2QJZ4SfwiDLK70p3SWMDSFDksAzxT NOYPFwT+XC2A1m5kvvZuYbVHE47uDArqPm1RXqJ//jztr7SPwtDachAiwUZVa3SoLw0Z qZ+CQ2Ru7tawVufVUgEXsNjjTYSUy69i8Mwi3xaNp4Qg+sFJtO6NaFQYMGGhqMgsWgtP 3zrQ== X-Gm-Message-State: ALoCoQn1B7ezA2eflXsX3ORaOhLcW7yrzuR5Q0uQfYmHPdX3mrx3q5kFkkRL7UrxaJ+fNnoJcbFB X-Received: by 10.180.37.198 with SMTP id a6mr6459wik.7.1433872604687; Tue, 09 Jun 2015 10:56:44 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.206.36 with SMTP id ll4ls102131lac.36.gmail; Tue, 09 Jun 2015 10:56:44 -0700 (PDT) X-Received: by 10.152.6.69 with SMTP id y5mr23364038lay.72.1433872604536; Tue, 09 Jun 2015 10:56:44 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id dl8si6359190lad.72.2015.06.09.10.56.44 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jun 2015 10:56:44 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by labpy14 with SMTP id py14so17423937lab.0 for <patchwork-forward@linaro.org>; Tue, 09 Jun 2015 10:56:44 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr23179171lac.41.1433872120113; Tue, 09 Jun 2015 10:48:40 -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 hn6csp2771408lbb; Tue, 9 Jun 2015 10:48:26 -0700 (PDT) X-Received: by 10.180.24.40 with SMTP id r8mr34761wif.24.1433872105998; Tue, 09 Jun 2015 10:48:25 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id eb8si4426372wib.36.2015.06.09.10.48.25 for <patches@linaro.org> (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 09 Jun 2015 10:48:25 -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 <pm215@archaic.org.uk>) id 1Z2NdP-0007yt-KC; Tue, 09 Jun 2015 18:48:23 +0100 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Cc: patches@linaro.org, Markus Armbruster <armbru@redhat.com>, Kevin Wolf <kwolf@redhat.com>, qemu-block@nongnu.org, Christian Borntraeger <borntraeger@de.ibm.com>, Cornelia Huck <cornelia.huck@de.ibm.com>, Alexander Graf <agraf@suse.de> Subject: [PATCH v2 3/3] hw/arm/virt: Make block devices default to virtio Date: Tue, 9 Jun 2015 18:48:23 +0100 Message-Id: <1433872103-30642-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1433872103-30642-1-git-send-email-peter.maydell@linaro.org> References: <1433872103-30642-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.215.47 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: <patchwork-forward.linaro.org> X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> |
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 1b1cc71..1cb56c8 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 = {
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 <peter.maydell@linaro.org> --- hw/arm/virt.c | 1 + 1 file changed, 1 insertion(+)