From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8DDEC43603 for ; Sun, 15 Dec 2019 09:59:15 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A68AE206DA for ; Sun, 15 Dec 2019 09:59:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RSqSNJ9z" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A68AE206DA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1igQfn-0003Hb-7K; Sun, 15 Dec 2019 09:58:47 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1igQfl-0003HU-Dh for xen-devel@lists.xenproject.org; Sun, 15 Dec 2019 09:58:45 +0000 X-Inumbo-ID: 7878c720-1f21-11ea-9278-12813bfff9fa Received: from us-smtp-1.mimecast.com (unknown [205.139.110.120]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 7878c720-1f21-11ea-9278-12813bfff9fa; Sun, 15 Dec 2019 09:58:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576403920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ojwrHY0zHg+5NLkr12eP+nk8VjcM3a/wtoqud6h53+8=; b=RSqSNJ9z74wGTFb39/WGdvVc0XFepJXUmmAXVHNWepT49l7O4xP0/jkcXJKCWDoKPwm1Gy SATIK8lRyddvzvvhTQ25oiA4g3KQIiu3F6xLtR0Xj0f3iuJgnYNTLnXmhTtdJzSh+5QBi3 82l6JpEondGhHSIvB6wjmXrWn7/0DY0= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-112-ExuwKdlIOtm4frHCkt-k0g-1; Sun, 15 Dec 2019 04:58:34 -0500 Received: by mail-qt1-f199.google.com with SMTP id c8so2602658qte.22 for ; Sun, 15 Dec 2019 01:58:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=uglnVCAjnaUsXT9ZTT7mKFQQrU34w0ggWLPMx7AnQTk=; b=sG8CX1fn+JSA3olahZqaOzjc8llJxbUGuwbO56wTgNEDCZhPl54FzgWAfX7XkJQogP Au4WJ0ZuZfmWqsiA/2AcD6C1BZjywrD0nFh7H2s2TdLfpjy8OYhRa4XgKIQDd3WearVK xPR4nJ7Z9u260D0ozv0eW4lhvho8Z7P04j6ZNMgaXdcxwmKKih0tgZNzmPM2775MxvnA Zdv6NeDhBrYh6DWSO4z2HkYIcVQj5Yz55IG/1ingLlL4C/mOcEqKnNQTRHC484QjDycg Bui0SVIUtIKb75uJDiVlziiPZfQR+0QyfYhK/0yj2yUOBEwgtbAsqUVJjnJ0rnIn7+VE eM9g== X-Gm-Message-State: APjAAAWZ8FsIci3Ed/L9+loJFLJdzsDDmUxWV2W8nLlqVTjMRbMlkTuw lj7hF9GjEWHXqt80YXRcDbQB2CxQ7cJgSwv0yQcm3xH36wMzuYjqfNrTrk7U8ZlzlxelxcqDBne CKPq7Z9VNnJjRPmoIkkFPwfniAmg= X-Received: by 2002:ac8:2bb9:: with SMTP id m54mr20346509qtm.150.1576403914505; Sun, 15 Dec 2019 01:58:34 -0800 (PST) X-Google-Smtp-Source: APXvYqxShGzMmQTP0GPg+U7XkjAABhRbEWqYV30OwRBbm04m47kjZ2QozlKgsELOkgUl7CsWCeS0Iw== X-Received: by 2002:ac8:2bb9:: with SMTP id m54mr20346493qtm.150.1576403914297; Sun, 15 Dec 2019 01:58:34 -0800 (PST) Received: from redhat.com (bzq-79-181-48-215.red.bezeqint.net. [79.181.48.215]) by smtp.gmail.com with ESMTPSA id 184sm4752304qke.73.2019.12.15.01.58.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2019 01:58:33 -0800 (PST) Date: Sun, 15 Dec 2019 04:58:27 -0500 From: "Michael S. Tsirkin" To: Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= Message-ID: <20191215045812-mutt-send-email-mst@kernel.org> References: <20191213161753.8051-1-philmd@redhat.com> <20191213161753.8051-13-philmd@redhat.com> MIME-Version: 1.0 In-Reply-To: X-MC-Unique: ExuwKdlIOtm4frHCkt-k0g-1 X-Mimecast-Spam-Score: 0 Content-Disposition: inline Subject: Re: [Xen-devel] [PATCH 12/12] hw/i386/pc: Move PC-machine specific declarations to 'pc_internal.h' X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Sergio Lopez , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , qemu-devel@nongnu.org, Paolo Bonzini , Marcel Apfelbaum , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , qemu-block@nongnu.org, John Snow , Richard Henderson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" T24gRnJpLCBEZWMgMTMsIDIwMTkgYXQgMDU6NDc6MjhQTSArMDEwMCwgUGhpbGlwcGUgTWF0aGll dS1EYXVkw6kgd3JvdGU6Cj4gT24gMTIvMTMvMTkgNToxNyBQTSwgUGhpbGlwcGUgTWF0aGlldS1E YXVkw6kgd3JvdGU6Cj4gPiBIaXN0b3JpY2FsbHksIFFFTVUgc3RhcnRlZCB3aXRoIG9ubHkgb25l IFg4NiBtYWNoaW5lOiB0aGUgUEMuCj4gPiBUaGUgJ2h3L2kzODYvcGMuaCcgaGVhZGVyIHdhcyB1 c2VkIHRvIHN0b3JlIGFsbCBYODYgYW5kIFBDCj4gPiBkZWNsYXJhdGlvbnMuIFNpbmNlIHdlIGhh dmUgbm93IG11bHRpcGxlIG1hY2hpbmVzIGJhc2VkIG9uIHRoZQo+ID4gWDg2IGFyY2hpdGVjdHVy ZSwgbW92ZSB0aGUgUEMtc3BlY2lmaWMgZGVjbGFyYXRpb25zIGluIGEgbmV3Cj4gPiBoZWFkZXIu Cj4gPiBXZSB1c2UgJ2ludGVybmFsJyBpbiB0aGUgbmFtZSB0byBleHBsaWNpdCB0aGlzIGhlYWRl ciBpcyByZXN0cmljdGVkCj4gPiB0byB0aGUgWDg2IGFyY2hpdGVjdHVyZS4gT3RoZXIgYXJjaGl0 ZWN0dXJlIGNhbiBub3QgYWNjZXNzIGl0Lgo+ID4gCj4gPiBTaWduZWQtb2ZmLWJ5OiBQaGlsaXBw ZSBNYXRoaWV1LURhdWTDqSA8cGhpbG1kQHJlZGhhdC5jb20+Cj4gPiAtLS0KPiA+IE1heWJlIG5h bWUgaXQgJ3BjX21hY2hpbmUuaCc/Cj4gCj4gSSBmb3Jnb3QgdG8gZGVzY3JpYmUgaGVyZSAoYW5k IGluIHRoZSBjb3ZlciksIHdoYXQncyBmb2xsb3cgYWZ0ZXIgdGhpcwo+IHBhdGNoLgo+IAo+IFBh dGNoICMxMyBtb3ZlcyBQQ01hY2hpbmVDbGFzcyB0bwo+IAo+IElmIHlvdSBpZ25vcmUgUENNYWNo aW5lU3RhdGUsICJody9pMzg2L3BjLmgiIG5vdyBvbmx5IGNvbnRhaW5zIDc2IGxpbmVzLCBhbmQK PiBpdCBpcyBlYXNpZXIgdG8gc2VlIHdoYXQgaXMgUEMgbWFjaGluZSBzcGVjaWZpYywgd2hhdCBp cyBYODYgc3BlY2lmaWMsIGFuZAo+IHdoYXQgaXMgZGV2aWNlIGdlbmVyaWMgKG5vdCBYODYgcmVs YXRlZCBhdCBhbGwpOgo+IAo+IC0gR1NJIGlzIGNvbW1vbiB0byBYODYgKFBhb2xvIHNlbnQgWzNd LCBbNl0pCj4gLSBJT0FQSUMgaXMgY29tbW9uIHRvIFg4Ngo+IC0gaTgyNTkgaXMgbXVsdGlhcmNo IChQYW9sbyBbMl0pCj4gLSBQQ0lfSE9TVCBkZWZpbml0aW9ucyBhbmQgcGNfcGNpX2hvbGU2NF9z dGFydCgpIGFyZSBYODYKPiAtIHBjX21hY2hpbmVfaXNfc21tX2VuYWJsZWQoKSBpcyBYODYgKFBh b2xvIHNlbnQgWzVdKQo+IC0gaHBldAo+IC0gdHNjIChQYW9sbyBzZW50IFszXSkKPiAtIDMgbW9y ZSBmdW5jdGlvbnMKPiAKPiBTbyB3ZSBjYW4gbW92ZSBoYWxmIG9mIHRoaXMgZmlsZSB0byAicGNf aW50ZXJuYWwuaCIgYW5kIHRoZSBvdGhlciB0bwo+IAo+IE9uZSBwcm9ibGVtIGlzIHRoZSBRMzUg TUNIIG5vcnRoIGJyaWRnZSB3aGljaCBkaXJlY3RseSBzZXRzIHRoZSBQQ0kKPiBQQ01hY2hpbmVT dGF0ZS0+YnVzIGluIHEzNV9ob3N0X3JlYWxpemUoKS4gVGhpcyBzZWVtcyBhIFFPTSB2aW9sYXRp b24gYW5kIGlzCj4gcHJvYmFibHkgZWFzaWx5IGZpeGFibGUuCj4gCj4gTWF5YmUgSSBjYW4gYXBw bHkgUGFvbG8ncyBwYXRjaGVzIGluc3RlYWQgb2YgdGhpcyAjMTIsIG1vdmUgWDg2LWdlbmVyaWMK PiBkZWNsYXJhdGlvbnMgdG8gImh3L2kzODYveDg2LmgiLCBhbmQgZGlyZWN0bHkgZ2l0LW1vdmUg d2hhdCdzIGxlZnQgb2YKPiAiaHcvaTM4Ni9wYy5oIiB0byAicGNfaW50ZXJuYWwuaCIuCgpZZWEg dGhhdCBzb3VuZHMgYSBiaXQgYmV0dGVyLgoKPiBbM10gaHR0cHM6Ly93d3cubWFpbC1hcmNoaXZl LmNvbS9xZW11LWRldmVsQG5vbmdudS5vcmcvbXNnNjY0NjI3Lmh0bWwKPiBbMl0gaHR0cHM6Ly93 d3cubWFpbC1hcmNoaXZlLmNvbS9xZW11LWRldmVsQG5vbmdudS5vcmcvbXNnNjY0NzY1Lmh0bWwK PiBbNV0gaHR0cHM6Ly93d3cubWFpbC1hcmNoaXZlLmNvbS9xZW11LWRldmVsQG5vbmdudS5vcmcv bXNnNjY0NzU0Lmh0bWwKPiBbNl0gaHR0cHM6Ly93d3cubWFpbC1hcmNoaXZlLmNvbS9xZW11LWRl dmVsQG5vbmdudS5vcmcvbXNnNjY0NzY2Lmh0bWwKPiAKPiA+IC0tLQo+ID4gICBody9pMzg2L3Bj X2ludGVybmFsLmggfCAxNDQgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrCj4gPiAgIGluY2x1ZGUvaHcvaTM4Ni9wYy5oICB8IDEyOCAtLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCj4gPiAgIGh3L2kzODYvYWNwaS1idWlsZC5jICB8ICAgMSArCj4g PiAgIGh3L2kzODYvcGMuYyAgICAgICAgICB8ICAgMSArCj4gPiAgIGh3L2kzODYvcGNfcGlpeC5j ICAgICB8ICAgMSArCj4gPiAgIGh3L2kzODYvcGNfcTM1LmMgICAgICB8ICAgMSArCj4gPiAgIGh3 L2kzODYvcGNfc3lzZncuYyAgICB8ICAgMSArCj4gPiAgIGh3L2kzODYveGVuL3hlbi1odm0uYyB8 ICAgMSArCj4gPiAgIDggZmlsZXMgY2hhbmdlZCwgMTUwIGluc2VydGlvbnMoKyksIDEyOCBkZWxl dGlvbnMoLSkKPiA+ICAgY3JlYXRlIG1vZGUgMTAwNjQ0IGh3L2kzODYvcGNfaW50ZXJuYWwuaAoK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZl bCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlz dHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68847C43603 for ; Sun, 15 Dec 2019 09:58:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A22E206DA for ; Sun, 15 Dec 2019 09:58:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Kj5ayt78" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726081AbfLOJ6j (ORCPT ); Sun, 15 Dec 2019 04:58:39 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:22422 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726050AbfLOJ6j (ORCPT ); Sun, 15 Dec 2019 04:58:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576403916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uglnVCAjnaUsXT9ZTT7mKFQQrU34w0ggWLPMx7AnQTk=; b=Kj5ayt78dNRA/DuWbzLJYZ+h02SXHE/bx+3eG2Wguaep3rfgAxxs5GlzVyKPgMY8EVTGzd 57jsz/13JAfmiGgxKIvM8cGJJrft81s5ZNDJPu6P/36P04xVt2UQ8no7EkMb7BI2fGfCX2 9WhfTufr29PDjHxgLjglqTk6+o7gx8s= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-268-VzXia93MMZCivjjR49OQvA-1; Sun, 15 Dec 2019 04:58:34 -0500 X-MC-Unique: VzXia93MMZCivjjR49OQvA-1 Received: by mail-qt1-f200.google.com with SMTP id d18so2624770qtp.16 for ; Sun, 15 Dec 2019 01:58:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=uglnVCAjnaUsXT9ZTT7mKFQQrU34w0ggWLPMx7AnQTk=; b=BT5nzTZuRqutbnXzSGLwdS/Ncjhxth30qTf1GrwD5YJQvjiq3toOIOvSgFX+JaFZkF d3qSOIYRrfbjkkPr/DuJz7ygu17QQmZDhq9vXb8RnDd9hry/++5+8pkHOTCv1BJKDmsq sRLi9TCLysc/nu0JlPOr85Y6dNl22Ik8DNz0N4y2NWBOaOAMe8tSLZ0VmU5o7KoaBzX+ WYKueuv4D6E4PLIPTFn5+bpktuTjKoOvvJXhZCRjxbvBe1sPuVqoQdi2RPhwhncMFZDt LSvp0ODY9AAaD2x+XcLDCjem+9CEBXefUqhxgpvIOtT4CuFzvE6zni0lGwH7269xy2g+ ln8A== X-Gm-Message-State: APjAAAUyv9b/dSxGbB4EHqh30FRpxV7HHu0pafPiuIz2DMYXusKzp5en ToADRWppA+LHVmpvdxLUEg0yXf7nGciwXQ5UNYF+peFARFnWS+WYqEczHLsDVR+McP7H6u/zBkm gQKPyTLgwD7aE X-Received: by 2002:ac8:2bb9:: with SMTP id m54mr20346510qtm.150.1576403914505; Sun, 15 Dec 2019 01:58:34 -0800 (PST) X-Google-Smtp-Source: APXvYqxShGzMmQTP0GPg+U7XkjAABhRbEWqYV30OwRBbm04m47kjZ2QozlKgsELOkgUl7CsWCeS0Iw== X-Received: by 2002:ac8:2bb9:: with SMTP id m54mr20346493qtm.150.1576403914297; Sun, 15 Dec 2019 01:58:34 -0800 (PST) Received: from redhat.com (bzq-79-181-48-215.red.bezeqint.net. [79.181.48.215]) by smtp.gmail.com with ESMTPSA id 184sm4752304qke.73.2019.12.15.01.58.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2019 01:58:33 -0800 (PST) Date: Sun, 15 Dec 2019 04:58:27 -0500 From: "Michael S. Tsirkin" To: Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= Cc: qemu-devel@nongnu.org, John Snow , Eduardo Habkost , Paul Durrant , Marcel Apfelbaum , kvm@vger.kernel.org, Stefano Stabellini , Igor Mammedov , Anthony Perard , qemu-block@nongnu.org, Richard Henderson , xen-devel@lists.xenproject.org, Paolo Bonzini , Sergio Lopez Subject: Re: [PATCH 12/12] hw/i386/pc: Move PC-machine specific declarations to 'pc_internal.h' Message-ID: <20191215045812-mutt-send-email-mst@kernel.org> References: <20191213161753.8051-1-philmd@redhat.com> <20191213161753.8051-13-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Fri, Dec 13, 2019 at 05:47:28PM +0100, Philippe Mathieu-Daudé wrote: > On 12/13/19 5:17 PM, Philippe Mathieu-Daudé wrote: > > Historically, QEMU started with only one X86 machine: the PC. > > The 'hw/i386/pc.h' header was used to store all X86 and PC > > declarations. Since we have now multiple machines based on the > > X86 architecture, move the PC-specific declarations in a new > > header. > > We use 'internal' in the name to explicit this header is restricted > > to the X86 architecture. Other architecture can not access it. > > > > Signed-off-by: Philippe Mathieu-Daudé > > --- > > Maybe name it 'pc_machine.h'? > > I forgot to describe here (and in the cover), what's follow after this > patch. > > Patch #13 moves PCMachineClass to > > If you ignore PCMachineState, "hw/i386/pc.h" now only contains 76 lines, and > it is easier to see what is PC machine specific, what is X86 specific, and > what is device generic (not X86 related at all): > > - GSI is common to X86 (Paolo sent [3], [6]) > - IOAPIC is common to X86 > - i8259 is multiarch (Paolo [2]) > - PCI_HOST definitions and pc_pci_hole64_start() are X86 > - pc_machine_is_smm_enabled() is X86 (Paolo sent [5]) > - hpet > - tsc (Paolo sent [3]) > - 3 more functions > > So we can move half of this file to "pc_internal.h" and the other to > > One problem is the Q35 MCH north bridge which directly sets the PCI > PCMachineState->bus in q35_host_realize(). This seems a QOM violation and is > probably easily fixable. > > Maybe I can apply Paolo's patches instead of this #12, move X86-generic > declarations to "hw/i386/x86.h", and directly git-move what's left of > "hw/i386/pc.h" to "pc_internal.h". Yea that sounds a bit better. > [3] https://www.mail-archive.com/qemu-devel@nongnu.org/msg664627.html > [2] https://www.mail-archive.com/qemu-devel@nongnu.org/msg664765.html > [5] https://www.mail-archive.com/qemu-devel@nongnu.org/msg664754.html > [6] https://www.mail-archive.com/qemu-devel@nongnu.org/msg664766.html > > > --- > > hw/i386/pc_internal.h | 144 ++++++++++++++++++++++++++++++++++++++++++ > > include/hw/i386/pc.h | 128 ------------------------------------- > > hw/i386/acpi-build.c | 1 + > > hw/i386/pc.c | 1 + > > hw/i386/pc_piix.c | 1 + > > hw/i386/pc_q35.c | 1 + > > hw/i386/pc_sysfw.c | 1 + > > hw/i386/xen/xen-hvm.c | 1 + > > 8 files changed, 150 insertions(+), 128 deletions(-) > > create mode 100644 hw/i386/pc_internal.h From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22FC7C43603 for ; Sun, 15 Dec 2019 09:59:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DD71421D7E for ; Sun, 15 Dec 2019 09:59:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YkS0Gx6a" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DD71421D7E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igQgJ-00074p-3n for qemu-devel@archiver.kernel.org; Sun, 15 Dec 2019 04:59:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50694) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igQfg-0006cE-FU for qemu-devel@nongnu.org; Sun, 15 Dec 2019 04:58:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1igQff-0001yc-3T for qemu-devel@nongnu.org; Sun, 15 Dec 2019 04:58:40 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:55780 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1igQfe-0001w6-Ti for qemu-devel@nongnu.org; Sun, 15 Dec 2019 04:58:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576403918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ojwrHY0zHg+5NLkr12eP+nk8VjcM3a/wtoqud6h53+8=; b=YkS0Gx6afGZrCP9Qobodd5GAzQpNjg7xqeK33cPJkIxsrrhy+CQElM4/HumfpuL3nk+Si2 N1XE2sdYh0JTQpRnmVe88I9p5Pw5KPeK0br6ydB0D1XOYqHwX33g8bsQ5DGh2E+24kWCNf yH0e+TitHYW2JEyIK20o+qxNelOfIVg= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-350-Cjy0qfHDMHCIFWU0-UCN_A-1; Sun, 15 Dec 2019 04:58:34 -0500 Received: by mail-qt1-f198.google.com with SMTP id b24so2653559qtp.1 for ; Sun, 15 Dec 2019 01:58:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=uglnVCAjnaUsXT9ZTT7mKFQQrU34w0ggWLPMx7AnQTk=; b=QcC0rk/Z2pCbhgiM6yXqNOmSGjqsjiqaJTvoy108lQc7TMRgGZaxWpW1rJBjo1/NrT q8e+YtcMGLzVp4zOBhTEoKl2AsEn1S27PSO/V7C+s97aUL4XnUDybTXGy9mbjXgw9bk9 hnxs4VCIgebUMlUaRIm0yML/DJCi+SL2PA8XkFOI2v2IHw4rK0+fny194GKlWpctuQZ9 +pghJm0p5EaSpLyM0heLYCoA4ciOOOYtOtIuwPoDPDmCWEyuYqgKDS/forSYJ15KkFWx 6cTB43RmDLXnwjTZkoToc+Br8zgthpFzG2lumS+7z1Bsd8q+2WmONcbm5WNbcbl0/cCK m9uQ== X-Gm-Message-State: APjAAAWSfzwnqJLrcMvVvuSYFdIy6tb9nO5wdMm2ggsSdQ1npHgA5z3P v7uD/qZnweWdICWobGjDU0FxvaxIW+Ib6B1J/+en4hdZn/sU3lsNRp/QSJedj5G/8+iTe3BHysG hBB35J1RRAnzQXis= X-Received: by 2002:ac8:2bb9:: with SMTP id m54mr20346506qtm.150.1576403914504; Sun, 15 Dec 2019 01:58:34 -0800 (PST) X-Google-Smtp-Source: APXvYqxShGzMmQTP0GPg+U7XkjAABhRbEWqYV30OwRBbm04m47kjZ2QozlKgsELOkgUl7CsWCeS0Iw== X-Received: by 2002:ac8:2bb9:: with SMTP id m54mr20346493qtm.150.1576403914297; Sun, 15 Dec 2019 01:58:34 -0800 (PST) Received: from redhat.com (bzq-79-181-48-215.red.bezeqint.net. [79.181.48.215]) by smtp.gmail.com with ESMTPSA id 184sm4752304qke.73.2019.12.15.01.58.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2019 01:58:33 -0800 (PST) Date: Sun, 15 Dec 2019 04:58:27 -0500 From: "Michael S. Tsirkin" To: Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= Subject: Re: [PATCH 12/12] hw/i386/pc: Move PC-machine specific declarations to 'pc_internal.h' Message-ID: <20191215045812-mutt-send-email-mst@kernel.org> References: <20191213161753.8051-1-philmd@redhat.com> <20191213161753.8051-13-philmd@redhat.com> MIME-Version: 1.0 In-Reply-To: X-MC-Unique: Cjy0qfHDMHCIFWU0-UCN_A-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Sergio Lopez , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , qemu-devel@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , qemu-block@nongnu.org, John Snow , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, Dec 13, 2019 at 05:47:28PM +0100, Philippe Mathieu-Daud=E9 wrote: > On 12/13/19 5:17 PM, Philippe Mathieu-Daud=E9 wrote: > > Historically, QEMU started with only one X86 machine: the PC. > > The 'hw/i386/pc.h' header was used to store all X86 and PC > > declarations. Since we have now multiple machines based on the > > X86 architecture, move the PC-specific declarations in a new > > header. > > We use 'internal' in the name to explicit this header is restricted > > to the X86 architecture. Other architecture can not access it. > >=20 > > Signed-off-by: Philippe Mathieu-Daud=E9 > > --- > > Maybe name it 'pc_machine.h'? >=20 > I forgot to describe here (and in the cover), what's follow after this > patch. >=20 > Patch #13 moves PCMachineClass to >=20 > If you ignore PCMachineState, "hw/i386/pc.h" now only contains 76 lines, = and > it is easier to see what is PC machine specific, what is X86 specific, an= d > what is device generic (not X86 related at all): >=20 > - GSI is common to X86 (Paolo sent [3], [6]) > - IOAPIC is common to X86 > - i8259 is multiarch (Paolo [2]) > - PCI_HOST definitions and pc_pci_hole64_start() are X86 > - pc_machine_is_smm_enabled() is X86 (Paolo sent [5]) > - hpet > - tsc (Paolo sent [3]) > - 3 more functions >=20 > So we can move half of this file to "pc_internal.h" and the other to >=20 > One problem is the Q35 MCH north bridge which directly sets the PCI > PCMachineState->bus in q35_host_realize(). This seems a QOM violation and= is > probably easily fixable. >=20 > Maybe I can apply Paolo's patches instead of this #12, move X86-generic > declarations to "hw/i386/x86.h", and directly git-move what's left of > "hw/i386/pc.h" to "pc_internal.h". Yea that sounds a bit better. > [3] https://www.mail-archive.com/qemu-devel@nongnu.org/msg664627.html > [2] https://www.mail-archive.com/qemu-devel@nongnu.org/msg664765.html > [5] https://www.mail-archive.com/qemu-devel@nongnu.org/msg664754.html > [6] https://www.mail-archive.com/qemu-devel@nongnu.org/msg664766.html >=20 > > --- > > hw/i386/pc_internal.h | 144 +++++++++++++++++++++++++++++++++++++++++= + > > include/hw/i386/pc.h | 128 ------------------------------------- > > hw/i386/acpi-build.c | 1 + > > hw/i386/pc.c | 1 + > > hw/i386/pc_piix.c | 1 + > > hw/i386/pc_q35.c | 1 + > > hw/i386/pc_sysfw.c | 1 + > > hw/i386/xen/xen-hvm.c | 1 + > > 8 files changed, 150 insertions(+), 128 deletions(-) > > create mode 100644 hw/i386/pc_internal.h