From patchwork Sun Jun 3 09:27:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 924705 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="pSsni0Xj"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40zCQD4zJtz9s1b for ; Sun, 3 Jun 2018 19:27:14 +1000 (AEST) Received: from localhost ([::1]:34248 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPPI5-000252-A4 for incoming@patchwork.ozlabs.org; Sun, 03 Jun 2018 05:27:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55049) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPPHj-00024x-0x for qemu-devel@nongnu.org; Sun, 03 Jun 2018 05:26:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fPPHf-0008Dh-Px for qemu-devel@nongnu.org; Sun, 03 Jun 2018 05:26:47 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:38574) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fPPHf-0008Cs-JR for qemu-devel@nongnu.org; Sun, 03 Jun 2018 05:26:43 -0400 Received: by mail-wm0-x243.google.com with SMTP id m129-v6so9305916wmb.3 for ; Sun, 03 Jun 2018 02:26:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ompxOVLIP1/v6nzIoK0fu+reENNJDguOnOVMIb9/BvU=; b=pSsni0Xj9NpsBFMBf+c6f4rV5A+9lFhcSRBBOoxaR3HXnpZ5RgIfSyWaPn1l5DHMya NGp95TasnjuXzb9rPPm1R0nfry82ROy2kl/WNRiFDlkRNqL11YZp5ocg803cmYXJRe4+ v9qhPHiIgoT7mqyniISiwmDGaHOW5TBDk8ZQcaY6pfqeSz2BKbgadQBfyMXwcfAyRglh LSymqF4L/DIvgHqXiz7lTIowhn8ZLV9w+53STF0hRX9QQqeGAXtUREv6IH6dzhw5tDAN mG/NckGwV8qWTFm1NdUqXgILsGNQt5jbC5HUgVBf0d022F8zHIPcxBFmH7GGqglucISG oPXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ompxOVLIP1/v6nzIoK0fu+reENNJDguOnOVMIb9/BvU=; b=IKPnKv5vxMhJGK6sN5YtbkfUnTDuTfTZ79aQKC3qZ3wNrhnJmCzUtvA9w/SXz3AGg7 z65xPDVj6fjKWrZrI+y8cNvszausUUGMPdFs0S1wpFIQeiMkrR07p/ZcN3xiyXJOAnd0 eUEsnKCLFUFwBM5Plgw+EG8VyeVQi2FjWOLFm/kyCA2JpzMkOevpif9n3sHho8pMYOox adaTOZMJCpxWz99pXAcE3rydpYQ8TjU/T9COUaaSOKUzKWXt+KYG714A562fBBKqnDGl kb349WnTI+z3xEdnOQqqyp1JxrST61Slj3qniSMuYjXc7UWvhdZ7njZVaMOyIomtR+bJ baYQ== X-Gm-Message-State: APt69E3om/7uGL61opPY/2PtPQvF52UbS4Lov8P+T1tIRfKoDB/Xb+yz SFbHPIaoplVPWsyVsR50CvWt9Q== X-Google-Smtp-Source: ADUXVKLE5fyrqO6I3vdI+aDY3qulkpyCSiur0BdV+6HmDQbalc/jVV++/CxYIwpsgaUAChySmkoiPg== X-Received: by 2002:a1c:8645:: with SMTP id i66-v6mr6962841wmd.40.1528018002220; Sun, 03 Jun 2018 02:26:42 -0700 (PDT) Received: from localhost.localdomain.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id u108-v6sm49320852wrc.40.2018.06.03.02.26.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 03 Jun 2018 02:26:41 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Sun, 3 Jun 2018 12:27:49 +0300 Message-Id: <20180603092749.107476-1-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.13.6 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PATCH RFC] hw/pc: set q35 as the default x86 machine X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Moving to QEMU 3.0 seems like a good opportunity for such a change. I440FX is really old and does not support modern features like IOMMU. Q35's SATA emulation is faster than pc's IDE, native PCI express hotplug is cleaner than ACPI based one and so on... Also the libvirt guys added very good support for the Q35 machine (thanks!). Management software should always specify the machine type and for the current setups, adding '-machine pc' to the command line is not such a big deal. In time the pc machine will fade out and we will probably stop adding new versions at some point. Signed-off-by: Marcel Apfelbaum --- hw/i386/pc_piix.c | 2 -- hw/i386/pc_q35.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index b4c5b03274..16dd65198f 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -429,7 +429,6 @@ static void pc_i440fx_3_0_machine_options(MachineClass *m) { pc_i440fx_machine_options(m); m->alias = "pc"; - m->is_default = 1; } DEFINE_I440FX_MACHINE(v3_0, "pc-i440fx-3.0", NULL, @@ -438,7 +437,6 @@ DEFINE_I440FX_MACHINE(v3_0, "pc-i440fx-3.0", NULL, static void pc_i440fx_2_12_machine_options(MachineClass *m) { pc_i440fx_3_0_machine_options(m); - m->is_default = 0; m->alias = NULL; SET_MACHINE_COMPAT(m, PC_COMPAT_2_12); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 83d6d75efa..b33c235d49 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -312,6 +312,7 @@ static void pc_q35_3_0_machine_options(MachineClass *m) { pc_q35_machine_options(m); m->alias = "q35"; + m->is_default = 1; } DEFINE_Q35_MACHINE(v3_0, "pc-q35-3.0", NULL, @@ -321,6 +322,7 @@ static void pc_q35_2_12_machine_options(MachineClass *m) { pc_q35_3_0_machine_options(m); m->alias = NULL; + m->is_default = 0; SET_MACHINE_COMPAT(m, PC_COMPAT_2_12); }