From patchwork Mon Sep 22 20:38:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 37699 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 94787202A1 for ; Mon, 22 Sep 2014 20:39:44 +0000 (UTC) Received: by mail-wg0-f71.google.com with SMTP id y10sf1952236wgg.2 for ; Mon, 22 Sep 2014 13:39:43 -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:date :message-id:in-reply-to:references: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; bh=7tIuNudgamBNvovyRIDazBRBOYQ5yjmhnSNZrANKw18=; b=OI1reFvIWx7fjOYA04oetu/CRL7G0fUzyEpIIhykbE9ozDula41qxUdY2A6jQqQdZz 2PcRQzzLmw+hKDGObQ9zIrOghwikKl973RU1fy7mjXizSavadQ8pFRFNRNm8nuh1FCnf JSrI2eeQ7ICziWRzcCdnDope66luXMY7EpZbrfR7DJw8uD5RrQa3yJWzSDo5S9LNdnUs HtP81n89kQ36cARQdrD4YdS9Fps+ToZ43e6gO0g5pxmFCPXgZSytQDhfbILq4NCu9FOl IWX7DtDIDHiSy0dX0T1F5whBOLQk6vLr5Dy4/YqFjf7Nm900d2x69XFeOayXy5W08Rtn 6bFw== X-Gm-Message-State: ALoCoQn/d3PPt1DiR2++HcTKuVj+qMJkVw1plq4EP6Yr1KGDg8NUKbWbCbY4mDluaCnpIX5q/mtm X-Received: by 10.180.76.230 with SMTP id n6mr2377871wiw.0.1411418383766; Mon, 22 Sep 2014 13:39:43 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.4.74 with SMTP id i10ls373250lai.54.gmail; Mon, 22 Sep 2014 13:39:43 -0700 (PDT) X-Received: by 10.152.21.168 with SMTP id w8mr28668208lae.59.1411418383486; Mon, 22 Sep 2014 13:39:43 -0700 (PDT) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com [209.85.215.48]) by mx.google.com with ESMTPS id xt5si15971057lbb.12.2014.09.22.13.39.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Sep 2014 13:39:43 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by mail-la0-f48.google.com with SMTP id ty20so7394918lab.21 for ; Mon, 22 Sep 2014 13:39:43 -0700 (PDT) X-Received: by 10.152.204.231 with SMTP id lb7mr28046873lac.44.1411418383329; Mon, 22 Sep 2014 13:39:43 -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.130.169 with SMTP id of9csp310674lbb; Mon, 22 Sep 2014 13:39:42 -0700 (PDT) X-Received: by 10.224.37.134 with SMTP id x6mr26264481qad.39.1411418381510; Mon, 22 Sep 2014 13:39:41 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e6si10291708qci.26.2014.09.22.13.39.40 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 22 Sep 2014 13:39:41 -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]:49126 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWAOa-0004pE-KF for patch@linaro.org; Mon, 22 Sep 2014 16:39:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35973) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWAO4-0004WL-0P for qemu-devel@nongnu.org; Mon, 22 Sep 2014 16:39:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XWANx-0000YS-Ry for qemu-devel@nongnu.org; Mon, 22 Sep 2014 16:39:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21580) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWANx-0000YH-Iw for qemu-devel@nongnu.org; Mon, 22 Sep 2014 16:39:01 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s8MKcsjD012678 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 22 Sep 2014 16:38:54 -0400 Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-96.ams2.redhat.com [10.36.116.96]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s8MKcfH5008717; Mon, 22 Sep 2014 16:38:50 -0400 From: Laszlo Ersek To: qemu-devel@nongnu.org, marcel.a@redhat.com, afaerber@suse.de, mst@redhat.com, peter.maydell@linaro.org, pbonzini@redhat.com, lersek@redhat.com Date: Mon, 22 Sep 2014 22:38:36 +0200 Message-Id: <1411418316-5169-3-git-send-email-lersek@redhat.com> In-Reply-To: <1411418316-5169-1-git-send-email-lersek@redhat.com> References: <1411418316-5169-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 2/2] 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: lersek@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.48 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 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 --- 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 103d756..4c27827 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 d4a907c..a199043 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -343,6 +343,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