From nobody Mon Feb 9 17:37:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 15415408600591016.6219119682279; Tue, 6 Nov 2018 13:47:40 -0800 (PST) Received: from localhost ([::1]:43696 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gK9Bv-0003KN-TH for importer@patchew.org; Tue, 06 Nov 2018 16:47:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40126) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gK9AY-0002l5-Kk for qemu-devel@nongnu.org; Tue, 06 Nov 2018 16:45:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gK93Q-00013Z-TR for qemu-devel@nongnu.org; Tue, 06 Nov 2018 16:38:36 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:34530) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gK93Q-0008PW-II for qemu-devel@nongnu.org; Tue, 06 Nov 2018 16:38:32 -0500 Received: by mail-wr1-x42f.google.com with SMTP id j26-v6so15233951wre.1 for ; Tue, 06 Nov 2018 13:38:10 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id l186-v6sm3223526wma.13.2018.11.06.13.38.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Nov 2018 13:38:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9HYY6/frCL/M/wh/nFcqpefqwQl2TVl6JVxcwWo5SQw=; b=SQciCpqTBARFDwlC1wMpnJS0ngP2wK6Y06aMr6TdSMpmIUFTVI1DBzIhwveF8iWYxe kcJGUncSlOyTwBfVjPMYJB5KApU1K+7Zs3UDt04A6UEsVoptam/S49laZbqP9DlwC6Ja 4OTuDuAt02bQXK4DrFPpnOsRiBk5M8HUztWrEOfRZhr9FxVO2G/+HJJJP18YU0OsRTyQ HcDzSIK6QlxnL0b3mySzlj4X45yKE7HSOLol5xh1eS6xrgLXIb4OVzPJ1atBJSv/JXa9 0tc1gTNGPsN+NbukFbC0FE/zTffnK36xMHdUARyhAxpvqemKrI/V3Zc4nGlWA15PCdv4 EXTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9HYY6/frCL/M/wh/nFcqpefqwQl2TVl6JVxcwWo5SQw=; b=d2OlLGtfZZuJ1uST4BsCSNYcK/E3bkxHyZ0ivTNrY2je6SBHFHZ7UzsFd4PDPqA6OT 1WuwgFilvAACVGTIomGPQf7RH4OUIh95LbhDlsBqkQtbbzRdCjTLmWvxhLckQKdLML/h YfbXi5ksOi9tWXOg0egsPTDLE3hnERtLEDbDvXjumDaH4/BfD6a5B06tdukHGaGuwcSf 3BsQnPrIFTQm6BQLixH57Fh3VzfzEhYFbNTUr8PD9jP9GYjLS4iUAr9hBA4cpQi6uT08 2qCZz7mfzWGfFUuuKtw+vIlvIEaV6hdvg1Q/0FdOZ7TojZ92BeT4oM8o18Bt6omnXrQq Rupg== X-Gm-Message-State: AGRZ1gK50dUsy5onsuwdE3U6xo4ydocJjOqXxrhWvOJUDh4F0YID+t7E HY8kalc0GofujXJfkYOYMmNn8Syh X-Google-Smtp-Source: AJdET5f1UnxNAAkKcEW0Rcf5xhX2Wx0+LiDrWxZdMTyMjRUtRausLE6+n7oMogmLbOPQl+OeYdiqYg== X-Received: by 2002:adf:f787:: with SMTP id q7-v6mr27153938wrp.9.1541540288961; Tue, 06 Nov 2018 13:38:08 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 6 Nov 2018 22:37:49 +0100 Message-Id: <1541540283-45699-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1541540283-45699-1-git-send-email-pbonzini@redhat.com> References: <1541540283-45699-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f Subject: [Qemu-devel] [PULL 03/17] i386: clarify that the Q35 machine type implements a P35 chipset 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Daniel P. Berrang=C3=A9 The 'q35' machine type implements an Intel Series 3 chipset, of which there are several variants: https://www.intel.com/Assets/PDF/datasheet/316966.pdf The key difference between the 82P35 MCH ('p35', PCI device ID 0x29c0) and 82Q35 GMCH ('q35', PCI device ID 0x29b0) variants is that the latter has an integrated graphics adapter. QEMU does not implement integrated graphics, so uses the PCI ID for the 82P35 chipset, despite calling the machine type 'q35'. Thus we rename the PCI device ID constant to reflect reality, to avoid confusing future developers. The new name more closely matches what pci.ids reports it to be: $ grep P35 /usr/share/hwdata/pci.ids | grep 29 29c0 82G33/G31/P35/P31 Express DRAM Controller 29c1 82G33/G31/P35/P31 Express PCI Express Root Port 29c4 82G33/G31/P35/P31 Express MEI Controller 29c5 82G33/G31/P35/P31 Express MEI Controller 29c6 82G33/G31/P35/P31 Express PT IDER Controller 29c7 82G33/G31/P35/P31 Express Serial KT Controller $ grep Q35 /usr/share/hwdata/pci.ids | grep 29 29b0 82Q35 Express DRAM Controller 29b1 82Q35 Express PCI Express Root Port 29b2 82Q35 Express Integrated Graphics Controller 29b3 82Q35 Express Integrated Graphics Controller 29b4 82Q35 Express MEI Controller 29b5 82Q35 Express MEI Controller 29b6 82Q35 Express PT IDER Controller 29b7 82Q35 Express Serial KT Controller Arguably the QEMU machine type should be named 'p35'. At this point in time, however, it is not worth the churn for management applications & documentation to worry about renaming it. Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20180830105757.10577-1-berrange@redhat.com> Signed-off-by: Paolo Bonzini --- hw/pci-host/q35.c | 10 +++++++++- include/hw/pci/pci_ids.h | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 966a7cf..71e4ca5 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -622,7 +622,15 @@ static void mch_class_init(ObjectClass *klass, void *d= ata) dc->desc =3D "Host bridge"; dc->vmsd =3D &vmstate_mch; k->vendor_id =3D PCI_VENDOR_ID_INTEL; - k->device_id =3D PCI_DEVICE_ID_INTEL_Q35_MCH; + /* + * The 'q35' machine type implements an Intel Series 3 chipset, + * of which there are several variants. The key difference between + * the 82P35 MCH ('p35') and 82Q35 GMCH ('q35') variants is that + * the latter has an integrated graphics adapter. QEMU does not + * implement integrated graphics, so uses the PCI ID for the 82P35 + * chipset. + */ + k->device_id =3D PCI_DEVICE_ID_INTEL_P35_MCH; k->revision =3D MCH_HOST_BRIDGE_REVISION_DEFAULT; k->class_id =3D PCI_CLASS_BRIDGE_HOST; /* diff --git a/include/hw/pci/pci_ids.h b/include/hw/pci/pci_ids.h index 63acc72..eeb3301 100644 --- a/include/hw/pci/pci_ids.h +++ b/include/hw/pci/pci_ids.h @@ -255,7 +255,7 @@ #define PCI_DEVICE_ID_INTEL_82801I_EHCI2 0x293c #define PCI_DEVICE_ID_INTEL_82599_SFP_VF 0x10ed =20 -#define PCI_DEVICE_ID_INTEL_Q35_MCH 0x29c0 +#define PCI_DEVICE_ID_INTEL_P35_MCH 0x29c0 =20 #define PCI_VENDOR_ID_XEN 0x5853 #define PCI_DEVICE_ID_XEN_PLATFORM 0x0001 --=20 1.8.3.1