From patchwork Mon Feb 26 17:38:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 775948 Delivered-To: patch@linaro.org Received: by 2002:ab3:621a:0:b0:258:3251:9e33 with SMTP id w26csp1500164lte; Mon, 26 Feb 2024 09:39:50 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVqVb4Bo+bbs8vIFczgXld92H8zNxBO2wa4yrB4kwA0v6TUHaTe0DsUF8kMNIHm4mR4e9YsXhqrflYh00RAHH2l X-Google-Smtp-Source: AGHT+IEawit0d5NiCZiJsXhlXhnqHfMfzskl2c0WVBw0+/0VezylXDy98Ag1rmF/3SdSckE2ckFr X-Received: by 2002:a0c:b55a:0:b0:68f:e855:52c3 with SMTP id w26-20020a0cb55a000000b0068fe85552c3mr5870563qvd.45.1708969190103; Mon, 26 Feb 2024 09:39:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708969190; cv=none; d=google.com; s=arc-20160816; b=YYUsK589nvsagmQTHo/KH/AfWGcipRRACD1FDZo77Dg7hEWXRL1lWQF1mfJOLIxdwk VVaQqTYNVICHQf/U/B0HjqgFInmMUuKzahxXFERo1H6tYQGVQ0GiJcQUqcR5uyfK8dhk AaE4NfRK+ON7B+XoWHmGSP7Atp1utZwyyN+KJCkTv2Qm4sCO+fYDRTOdMWL9o5jmSw+B bamLwew/QTcBgzDvbOgYw0yVTYE8ikk8sdT05zYv66xQ83JVrIWBlHshGHmX1KlHrGpY 7DBharxShiLDBoQbEn8gtjxb0bFzOLrA03v8nATNZoi5R5kfCdJ08MOF+JGGDtiND6/n O1Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ibVcW3lwaKG1GGTyMtc1ku+JoJ+rReT+MXHBNQRHkgA=; fh=n0PTKc6cFaTUPm+4LUzQHB6y5ChB5NluvE1RUm3gstw=; b=iP14cf4W1XjRP/JUvjk5+4ugTWiLJaR+6ULC4draM8pXwnKFWvu7eR2WFriCQBYQEL 6aGUtnCwzVJ1Lio3BtAaNdSge0DUmaBbJnV5/EEviUnFWOgylLSiowKU+hDnwS+nymLO hATzZgTSOgYiOHwV2V27Ds79OjrToE0NfpabX3FTmcr6kwO6zx/IuvLTryxTDA6TeRGm DHnF79qxLIn1F593JW+ItFTBWX3dwBoHCDNwAlNKq0OByUAKAyFt2FXz/ZJFuTuW11TN BybzbnwQ4QyCVwabLWw1uVFMsxGJjv5Geg+OYAs0Qh/zjm6NT/8ScOkNegKBC+YE+akJ zLkA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GWXD2Kas; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u15-20020a0562141c0f00b0068f731f88c7si5571945qvc.312.2024.02.26.09.39.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Feb 2024 09:39:50 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GWXD2Kas; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1reew8-0004VT-1a; Mon, 26 Feb 2024 12:38:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1reew4-0004FQ-3D for qemu-devel@nongnu.org; Mon, 26 Feb 2024 12:38:41 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1reew1-00079e-AJ for qemu-devel@nongnu.org; Mon, 26 Feb 2024 12:38:39 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-412a38e2adaso10228975e9.1 for ; Mon, 26 Feb 2024 09:38:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708969115; x=1709573915; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ibVcW3lwaKG1GGTyMtc1ku+JoJ+rReT+MXHBNQRHkgA=; b=GWXD2Kas0o3bCKek52U4V18Gkimi3pSbE3BOSVXHsEwmeHLzb3iNw4pE82e377zHGy m6w53sX828oCFEIXDs03oYzT7Zq5cwufQkYJmgg69wfh9LV6JOYSZ5LCublk1mROaVC8 2dO0w6FlXRziCyfbstb0g10rhAF//xwYWk3jSGSWTeQS73RE3MMqI59Vf45GdqwUtR04 5+Mx/RTeg3yBB4MLKdvw+NYgRB5C6jpqGn90RzYKPeuBfpOO45rdjgHgdk6kIi4faZst YmutUHAtL+VPJQoCv5eN5cWtTk9Iw68yBj4+TMDPyxl958SoXEMWlyOFj8reuT6gdP// lB2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708969115; x=1709573915; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ibVcW3lwaKG1GGTyMtc1ku+JoJ+rReT+MXHBNQRHkgA=; b=dsod3a1FX0gJSbwI34ktiX+RjEffpfA/X10kxpa+T/FxY6s4zABluol2AWolfRyNaZ FvGaJRxZfDJ3QqEQIEPyuS/ib2v8VOZ9s5ZVgcJh57GS1S01dK2slF01flHbAT0tSR0E RLSiMOeCmvAUmI8QQ5vxRkl87KlZObz2dZQuCIY768yPsf8Ki/AHcKpVevXbtfOHMnOx 2ka+Kkg1nWXvzw+UT9KC0QwasRUjjOnQBFD+YeWdg8u1rws/QmGJAAGxhc/X7cSwFbHo /xVsfNrzMOkQ8De7lw2YIapoYeLuwGD8uXXgEdHWzuKXh56qRPTqhkEAOLMM9S823bfs //gg== X-Gm-Message-State: AOJu0YwIRQX/qd0uQHRBbt8lxx4FvWu/R4/WgwoMFS9A1+OrsjcxCBXo mmqvqp9h7QmLGy7AuOLlgZQIZaEqtcxscx2NMe676CXIr8/NnGZJ0fQrGbHBQNM3PQRdjD6nlac S X-Received: by 2002:a05:600c:5246:b0:412:8d98:78a with SMTP id fc6-20020a05600c524600b004128d98078amr7017617wmb.13.1708969115328; Mon, 26 Feb 2024 09:38:35 -0800 (PST) Received: from m1x-phil.lan ([176.187.223.153]) by smtp.gmail.com with ESMTPSA id v6-20020a05600c470600b00412a2919d98sm5708711wmo.10.2024.02.26.09.38.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 26 Feb 2024 09:38:34 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Paolo Bonzini , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , kvm@vger.kernel.org Subject: [PATCH v2 5/6] hw/i386/kvmvapic: Inline sysbus_address_space() Date: Mon, 26 Feb 2024 18:38:03 +0100 Message-ID: <20240226173805.289-6-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240226173805.289-1-philmd@linaro.org> References: <20240226173805.289-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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 sysbus_address_space(...) is a simple wrapper to get_system_memory(). Use it in place, since KVM VAPIC doesn't distinct address spaces. Rename the 'as' variable as 'mr' since it is a MemoryRegion type, not an AddressSpace one. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- hw/i386/kvmvapic.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index 20b0300357..61a65ef2ab 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -58,6 +58,7 @@ typedef struct GuestROMState { struct VAPICROMState { SysBusDevice busdev; + MemoryRegion io; MemoryRegion rom; uint32_t state; @@ -581,19 +582,17 @@ static int vapic_map_rom_writable(VAPICROMState *s) { hwaddr rom_paddr = s->rom_state_paddr & ROM_BLOCK_MASK; MemoryRegionSection section; - MemoryRegion *as; + MemoryRegion *mr = get_system_memory(); size_t rom_size; uint8_t *ram; - as = sysbus_address_space(&s->busdev); - if (s->rom_mapped_writable) { - memory_region_del_subregion(as, &s->rom); + memory_region_del_subregion(mr, &s->rom); object_unparent(OBJECT(&s->rom)); } /* grab RAM memory region (region @rom_paddr may still be pc.rom) */ - section = memory_region_find(as, 0, 1); + section = memory_region_find(mr, 0, 1); /* read ROM size from RAM region */ if (rom_paddr + 2 >= memory_region_size(section.mr)) { @@ -614,7 +613,7 @@ static int vapic_map_rom_writable(VAPICROMState *s) memory_region_init_alias(&s->rom, OBJECT(s), "kvmvapic-rom", section.mr, rom_paddr, rom_size); - memory_region_add_subregion_overlap(as, rom_paddr, &s->rom, 1000); + memory_region_add_subregion_overlap(mr, rom_paddr, &s->rom, 1000); s->rom_mapped_writable = true; memory_region_unref(section.mr);