From nobody Mon Feb 9 08:56:59 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599575175; cv=none; d=zohomail.com; s=zohoarc; b=Z2avzi3RbJnndWetwOlPbOFszId7p/H01+6X2GpmcUXBQeHVeTxBck7Wda/5zVdszaTaqexwvTIeBV8UgzC2vdtdmuIKdzxfCnboyWkfb4yWqpJuKl5xvYIfgXdOLr5491yBVplBZBKIE9s+fO8xKqvUZ6fEwK+Rzi0Ey2NTCOI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599575175; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=L9MSzTqEXdEyImaMC4bb2Kv6juBLliyTUBhWiXmnlsA=; b=QT6vwnoug9WvWesWNOGBBsm0USXxsIHi+l75AFpullygmzhpqjQTh1nnGfe9BbG+1YPVhkiuT5yDTFiGIV8979QxBMwjqFOtiDi2zOK/+P8z0KZ4nCpfzmEjE2HAAiGlC8XFoHX41aJcwQQ1sCyeHRkjixntgdUF53Zm4TOdgp8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1599575175742111.04538678283086; Tue, 8 Sep 2020 07:26:15 -0700 (PDT) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-366-X3m1YCh9NVq-NWDM0rKGiA-1; Tue, 08 Sep 2020 10:26:12 -0400 Received: by mail-wm1-f71.google.com with SMTP id u5so4540132wme.3 for ; Tue, 08 Sep 2020 07:26:12 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id a10sm30865798wmj.38.2020.09.08.07.26.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 07:26:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599575174; 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=L9MSzTqEXdEyImaMC4bb2Kv6juBLliyTUBhWiXmnlsA=; b=J82RGm7xEY9tz9OFscJkzXqpCzLOWMbplQ+5al8ObNgCTPq1w5Uf9OMisKx+V/RhhZEza9 zlctDB5gikXKHhjryQzqVA/aBD5FuaH6VDoznfApq5PacwWuleoMillvlB8pQZVnqMoVIY DQXlIJpw8EfgmNdGoac6F9JEIQxuPzU= X-MC-Unique: X3m1YCh9NVq-NWDM0rKGiA-1 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=L9MSzTqEXdEyImaMC4bb2Kv6juBLliyTUBhWiXmnlsA=; b=jZLG6tLBhHPw1mFEATo6RZxzdGI01XtBe5qNZyofAc+4p1tng0Rhy6gHrqDhqXebjc 44MDAItxmGmuL/iKK7XBMjVYpcyr34vsR/G5BPlo6YhhFKanlbM7ov0aP8EKfctw9aDQ wYT0fyGhtxZDrtcG0KKsqaFCO8sJKuZ4OeBvcIrS6GCY/MBS8+npCkugfCVNL1jhQ7m0 ftc75cNfOI0w01Doi4QdJ3fCYPJWbV0jlQSDUbebqCvy5Mw8SbiY0eZr89Y5fJ+anuy6 DzLRqWRxGVszlfN+fq6BZrt4Ju1IgtYWT3YuTNnWOCZuP0ZNp6FPumQHwWxRsVYscmfu Yt+g== X-Gm-Message-State: AOAM533rhXQjmaIPu1raCUEfyBFlKhrMdS7n/T4Oh4S5D7fVbmuWnB2c FgLitwJ8sdOMWoh8I9HDhrDy2UQVpGrMe2IyYG0uv3G/4BbIsc30eUGPuizIw+29URqSGtV1pbF ukJbb2rHJTiQwfA== X-Received: by 2002:a1c:5f46:: with SMTP id t67mr4633434wmb.71.1599575171514; Tue, 08 Sep 2020 07:26:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz3vgB6KYzGWWNNlxEePF5U1CwXzF+kjRAXT8UQ0UbqHEu67mnmI4scehmYDtJwRd7p3yPSHg== X-Received: by 2002:a1c:5f46:: with SMTP id t67mr4633412wmb.71.1599575171290; Tue, 08 Sep 2020 07:26:11 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anthony Perard , "Michael S. Tsirkin" , Paul Durrant , Eduardo Habkost , Marcel Apfelbaum , Richard Henderson , Stefano Stabellini , Paolo Bonzini , xen-devel@lists.xenproject.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/5] hw/i386/xen: Rename X86/PC specific function as xen_hvm_init_pc() Date: Tue, 8 Sep 2020 16:25:56 +0200 Message-Id: <20200908142559.192945-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200908142559.192945-1-philmd@redhat.com> References: <20200908142559.192945-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0.003 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) xen_hvm_init() is only meanful to initialize a X86/PC machine, rename it as xen_hvm_init_pc(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/xen/xen.h | 2 +- accel/stubs/xen-stub.c | 2 +- hw/i386/pc_piix.c | 6 +++--- hw/i386/xen/xen-hvm.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 771dd447f2b..b2b459964cb 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -30,7 +30,7 @@ qemu_irq *xen_interrupt_controller_init(void); =20 void xenstore_store_pv_console_info(int i, struct Chardev *chr); =20 -void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory); +void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory); =20 void xen_register_framebuffer(struct MemoryRegion *mr); =20 diff --git a/accel/stubs/xen-stub.c b/accel/stubs/xen-stub.c index 8ae658acff5..fa3dddbce57 100644 --- a/accel/stubs/xen-stub.c +++ b/accel/stubs/xen-stub.c @@ -46,7 +46,7 @@ void xen_register_framebuffer(MemoryRegion *mr) { } =20 -void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) +void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory) { } =20 diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 32b1453e6a8..3e008bb0b1a 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -117,8 +117,8 @@ static void pc_init1(MachineState *machine, * so legacy non-PAE guests can get as much memory as possible in * the 32bit address space below 4G. * - * - Note that Xen has its own ram setp code in xen_ram_init(), - * called via xen_hvm_init(). + * - Note that Xen has its own ram setup code in xen_ram_init(), + * called via xen_hvm_init_pc(). * * Examples: * qemu -M pc-1.7 -m 4G (old default) -> 3584M low, 512M high @@ -127,7 +127,7 @@ static void pc_init1(MachineState *machine, * qemu -M pc,max-ram-below-4g=3D4G -m 3968M -> 3968M low (=3D4G-1= 28M) */ if (xen_enabled()) { - xen_hvm_init(pcms, &ram_memory); + xen_hvm_init_pc(pcms, &ram_memory); } else { if (!pcms->max_ram_below_4g) { pcms->max_ram_below_4g =3D 0xe0000000; /* default: 3.5G */ diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index cde981bad66..49748cda3fb 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -1395,7 +1395,7 @@ static int xen_map_ioreq_server(XenIOState *state) return 0; } =20 -void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) +void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory) { MachineState *ms =3D MACHINE(pcms); unsigned int max_cpus =3D ms->smp.max_cpus; --=20 2.26.2