From patchwork Wed Oct 22 08:18:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 39260 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 872C820341 for ; Wed, 22 Oct 2014 08:23:56 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id ge10sf1736533lab.1 for ; Wed, 22 Oct 2014 01:23:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:date:from:to:message-id:references :mime-version:in-reply-to:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-disposition; bh=ddq4nSVYrtaxr6KEhTaTLLUkTlbKkhWPh1NGKABdA5U=; b=ZGUmFtwnrhqvhkLbEsxgkYPgr+GFn4ycEPMxbeV+lf/uAgVS0KuhfwokE1BKChwTx2 DaXISxHFIjIxuGpeB6uWzhJTG3ZhjR1wdrn2uRdBTtXs5Td0LoRNUoQfCobKZEsPCFKq xIXeFjkIw8ehSHQHtkvt+MANsai9k4UReCqL/m3+PAcu8HpyigaiqsddJRXn4OGErNlO jqcQIrEBvghMtvC1s68GN9cV6ULEMQ7D/fpcOxMumoLWQnKETreD8x59k13din90Q71D yWsgYub+nj0s9zZ2kD/ChbnKDm48qeuKsln43wob5K+9ng+ugu33E/+WXdcXVzSjHhbT 51UA== X-Gm-Message-State: ALoCoQl2+8tQaIo1lCBeeO6YWmAzXDZGEReuKbTSMe08VT4VzsMu2fA28cJuqRVQpOchWg7gu/Sn X-Received: by 10.152.26.72 with SMTP id j8mr6234381lag.3.1413966235403; Wed, 22 Oct 2014 01:23:55 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.170.133 with SMTP id am5ls173838lac.54.gmail; Wed, 22 Oct 2014 01:23:55 -0700 (PDT) X-Received: by 10.112.198.226 with SMTP id jf2mr21878958lbc.84.1413966235155; Wed, 22 Oct 2014 01:23:55 -0700 (PDT) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id dl8si22362354lad.68.2014.10.22.01.23.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 Oct 2014 01:23:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by mail-la0-f45.google.com with SMTP id q1so2484110lam.18 for ; Wed, 22 Oct 2014 01:23:55 -0700 (PDT) X-Received: by 10.152.6.228 with SMTP id e4mr40113902laa.71.1413966235062; Wed, 22 Oct 2014 01:23:55 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp31004lbz; Wed, 22 Oct 2014 01:23:54 -0700 (PDT) X-Received: by 10.140.32.227 with SMTP id h90mr49333283qgh.13.1413966233940; Wed, 22 Oct 2014 01:23:53 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p39si26744799qgp.16.2014.10.22.01.23.53 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 22 Oct 2014 01:23:53 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:55475 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgrCy-0007PY-V1 for patch@linaro.org; Wed, 22 Oct 2014 04:23:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45561) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xgr4E-0001k8-Cn for qemu-devel@nongnu.org; Wed, 22 Oct 2014 04:14:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xgr49-0005l8-Ag for qemu-devel@nongnu.org; Wed, 22 Oct 2014 04:14:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42181) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xgr49-0005ky-2V for qemu-devel@nongnu.org; Wed, 22 Oct 2014 04:14:45 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9M8EdWo032388 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 22 Oct 2014 04:14:40 -0400 Received: from redhat.com (ovpn-116-33.ams2.redhat.com [10.36.116.33]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id s9M8EZV2013755; Wed, 22 Oct 2014 04:14:36 -0400 Date: Wed, 22 Oct 2014 11:18:12 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1413965859-7698-4-git-send-email-mst@redhat.com> References: <1413965859-7698-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <1413965859-7698-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell , Marcel Apfelbaum , Anthony Liguori , Paolo Bonzini , Laszlo Ersek , David Gibson Subject: [Qemu-devel] [PULL v2 3/9] i386/pc: add piix and q35 machtypes to sorting families for -M \? X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mst@redhat.com 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.45 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Content-Disposition: inline From: Laszlo Ersek With this patch applied, the output of -M \? is > Supported machines are: > pc Standard PC (i440FX + PIIX, 1996) (alias of pc-i440fx-2.2) > pc-i440fx-2.2 Standard PC (i440FX + PIIX, 1996) (default) > pc-i440fx-2.1 Standard PC (i440FX + PIIX, 1996) > pc-i440fx-2.0 Standard PC (i440FX + PIIX, 1996) > pc-i440fx-1.7 Standard PC (i440FX + PIIX, 1996) > pc-i440fx-1.6 Standard PC (i440FX + PIIX, 1996) > pc-i440fx-1.5 Standard PC (i440FX + PIIX, 1996) > pc-i440fx-1.4 Standard PC (i440FX + PIIX, 1996) > pc-1.3 Standard PC (i440FX + PIIX, 1996) > pc-1.2 Standard PC (i440FX + PIIX, 1996) > pc-1.1 Standard PC (i440FX + PIIX, 1996) > pc-1.0 Standard PC (i440FX + PIIX, 1996) > pc-0.15 Standard PC (i440FX + PIIX, 1996) > pc-0.14 Standard PC (i440FX + PIIX, 1996) > pc-0.13 Standard PC (i440FX + PIIX, 1996) > pc-0.12 Standard PC (i440FX + PIIX, 1996) > pc-0.11 Standard PC (i440FX + PIIX, 1996) > pc-0.10 Standard PC (i440FX + PIIX, 1996) > q35 Standard PC (Q35 + ICH9, 2009) (alias of pc-q35-2.2) > pc-q35-2.2 Standard PC (Q35 + ICH9, 2009) > pc-q35-2.1 Standard PC (Q35 + ICH9, 2009) > pc-q35-2.0 Standard PC (Q35 + ICH9, 2009) > pc-q35-1.7 Standard PC (Q35 + ICH9, 2009) > pc-q35-1.6 Standard PC (Q35 + ICH9, 2009) > pc-q35-1.5 Standard PC (Q35 + ICH9, 2009) > pc-q35-1.4 Standard PC (Q35 + ICH9, 2009) > isapc ISA-only PC > none empty machine RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1145042 Signed-off-by: Laszlo Ersek Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Paolo Bonzini Reviewed-by: Marcel Apfelbaum Acked-by: David Gibson --- hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 1 + 2 files changed, 2 insertions(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 4384633..25ca253 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -451,6 +451,7 @@ static void pc_xen_hvm_init(MachineState *machine) #define PC_I440FX_MACHINE_OPTIONS \ PC_DEFAULT_MACHINE_OPTIONS, \ + .family = "pc_piix", \ .desc = "Standard PC (i440FX + PIIX, 1996)", \ .hot_add_cpu = pc_hot_add_cpu diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index bb0dc8e..905e79d 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -347,6 +347,7 @@ static void pc_q35_init_1_4(MachineState *machine) #define PC_Q35_MACHINE_OPTIONS \ PC_DEFAULT_MACHINE_OPTIONS, \ + .family = "pc_q35", \ .desc = "Standard PC (Q35 + ICH9, 2009)", \ .hot_add_cpu = pc_hot_add_cpu, \ .units_per_default_bus = 1