From patchwork Mon Nov 3 12:44:51 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: 40024 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8DD3821894 for ; Mon, 3 Nov 2014 12:48:41 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id x13sf6189324wgg.1 for ; Mon, 03 Nov 2014 04:48:40 -0800 (PST) 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=ESagJvOSHT7MTum2Yc8jMT1o0BJn9NoWValaBcql7mU=; b=WbGDvhsKu4cKy++M7fmOVOJYoao9ChklAq6XkoiOosTxtGUu/bHKmygiLLwLYmu0Ri zxY/EW6Y/h/D+oB4OnARlULz2ZJdgKbTT+FITBGzuxTJ1yRCZaL2MCjUrl082vUajSmi O1j4XRM3yCnd9XG1R1FVifGzyX+Ph6ou+vIf8NS3YLPy/mK90WYEh9pTiWQXbt72k0Kl 5Lbvxlsw5pBpK5VZJF5uoVXlUA09N/0E96996SYcRUDgwk9kskzOQUgOXur8BQBkXww/ FyKMINAiFvz674ZALpI1jiFUmpDLUchetFX0zMJEoKYaeaCC3WiYfifX1JKqDn5MEh1b wW1A== X-Gm-Message-State: ALoCoQmQa36Zzhu7Tiz03HONMv4ULZ/42LRqN5QjAY/oGDznUyr/aya3KKZz8WjpAVLvAmBxdjsm X-Received: by 10.181.29.105 with SMTP id jv9mr2839736wid.1.1415018920809; Mon, 03 Nov 2014 04:48:40 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.9.168 with SMTP id a8ls692362lab.55.gmail; Mon, 03 Nov 2014 04:48:40 -0800 (PST) X-Received: by 10.112.168.97 with SMTP id zv1mr24666304lbb.6.1415018920650; Mon, 03 Nov 2014 04:48:40 -0800 (PST) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id l8si32379358lah.23.2014.11.03.04.48.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Nov 2014 04:48:40 -0800 (PST) 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 mail-lb0-f179.google.com with SMTP id l4so2478118lbv.24 for ; Mon, 03 Nov 2014 04:48:40 -0800 (PST) X-Received: by 10.112.130.41 with SMTP id ob9mr49762300lbb.74.1415018920182; Mon, 03 Nov 2014 04:48:40 -0800 (PST) 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 c5csp228018lbz; Mon, 3 Nov 2014 04:48:39 -0800 (PST) X-Received: by 10.224.103.200 with SMTP id l8mr64272166qao.52.1415018918661; Mon, 03 Nov 2014 04:48:38 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e10si29365693qac.100.2014.11.03.04.48.38 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 03 Nov 2014 04:48:38 -0800 (PST) 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]:34300 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlH3l-0003j0-U5 for patch@linaro.org; Mon, 03 Nov 2014 07:48:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51111) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlH0N-00075o-7S for qemu-devel@nongnu.org; Mon, 03 Nov 2014 07:45:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XlH0G-00080t-V4 for qemu-devel@nongnu.org; Mon, 03 Nov 2014 07:45:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53902) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlH0G-00080n-OQ for qemu-devel@nongnu.org; Mon, 03 Nov 2014 07:45:00 -0500 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 sA3CisbQ014937 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 3 Nov 2014 07:44:55 -0500 Received: from redhat.com (ovpn-116-73.ams2.redhat.com [10.36.116.73]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id sA3Cip71023053; Mon, 3 Nov 2014 07:44:52 -0500 Date: Mon, 3 Nov 2014 14:44:51 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1415018633-16041-4-git-send-email-mst@redhat.com> References: <1415018633-16041-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <1415018633-16041-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 , Richard Henderson , Laszlo Ersek , David Gibson Subject: [Qemu-devel] [PULL 03/29] 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.217.179 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 91a20cb..e4e0beb 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 e225c6d..9c44cd6 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