From patchwork Wed May 7 18:03:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 888078 Delivered-To: patch@linaro.org Received: by 2002:a5d:4683:0:b0:38f:210b:807b with SMTP id u3csp513887wrq; Wed, 7 May 2025 11:05:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUrN3kQE7PMZlQs+Y3/tLNgzUzjUHTtqV5uqUa0dEHHog7TY/uEezVMIfkyd05Dqj22ywKDAQ==@linaro.org X-Google-Smtp-Source: AGHT+IGjVftV+y/QQViLJYS3yDB8AKzqkXJMeEkEAZOxb2u9nTuvysNeDBY5oeoNtsTs/qZiXcTO X-Received: by 2002:adf:f502:0:b0:3a0:b550:c6f1 with SMTP id ffacd0b85a97d-3a0b550c6f6mr2890026f8f.9.1746641111039; Wed, 07 May 2025 11:05:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746641111; cv=none; d=google.com; s=arc-20240605; b=Pus4vA5I49gPeK89g4SaSSOg/0+5jSyE0BHnq5FPJggq/SOH0tNpIXOu5g1LrDAQKM wVNEvI3iFL9xbPTZnq6LHZKtG5Qn80qJvgGpvNvQhwA71elR4NL97aO5vNGa4X+xkS7E 5AlTBMi9Gpmzs9eIgwmwB5pG6XUVB3eJOHP/1uvLZMQNjSXviBbQJq1pRQNuJyx7z+up BT2+OV4AU6dNDtbnA8bDJFom4rjzcAlrBAL2tnbdiEq6LfEYKUEg0Ru7BviP7LxTyixi UM+XtHKzBY+p2xIAkvywICuTvsF+PKoSh+Ul0TVqAIsT88OPz+32UttIZXzGHeCjme5M 0RmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=+FmINfEuzwMzGHrtY9oGOYa+RnnhD8jDDpsSsdmEKc8=; fh=IwCXGV4wPY6ObB9cIuDHqEqMPAzAKMp05WxPgfySCiA=; b=kSstCxuvqpa1kNqw02oK/CqIWfhiKnukNGx6GcBexMk9SSx4anE3XkVE52MMxHDyyo l+AqnVGiYs0MWvRXTE+qz8I4be2gLRMyJhPwkvMLMc8wPzaNwz04FunQVTTNdeyHnB6x WHAq2L9GexuuKCbqjWJjoTgeuJepJXUSN/hH9MTyW5dDKm7Bkot8dqySFGe/uDRHt6BD DOPeePLLQoXpRi9tUXghk4a9KUA+hbMM82lFBlQlmbBTFajxAZhSjNl0S7sX0vSuF96k znmuSERMcvAx1h4TFGGNwIZ/tl+gGfAzZn6wlVHlHnzFPcTJNpq84mu7kiZ2xmgPmzQ7 Tnbg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-3a0b37afcb5si2252245f8f.404.2025.05.07.11.05.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 May 2025 11:05:11 -0700 (PDT) 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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCj86-000889-5i; Wed, 07 May 2025 14:04:27 -0400 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 1uCj83-00086t-AZ; Wed, 07 May 2025 14:04:23 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCj81-00089l-Ct; Wed, 07 May 2025 14:04:23 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id E112811FEF7; Wed, 07 May 2025 21:03:59 +0300 (MSK) Received: from think4mjt.origo (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id BDA7A2066FC; Wed, 7 May 2025 21:04:12 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Gustavo Romero , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 02/21] hw/pci/pci.c: Turn DPRINTF into trace events Date: Wed, 7 May 2025 21:03:53 +0300 Message-Id: <20250507180412.182797-3-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250507180412.182797-1-mjt@tls.msk.ru> References: <20250507180412.182797-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 From: Gustavo Romero Remove PCI_DPRINTF() macro and use trace events instead. Signed-off-by: Gustavo Romero Reviewed-by: Michael Tokarev Signed-off-by: Michael Tokarev --- hw/pci/pci.c | 19 ++++++------------- hw/pci/trace-events | 4 ++++ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index fe38c4c028..352b3d12c8 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -54,13 +54,6 @@ #include "hw/xen/xen.h" #include "hw/i386/kvm/xen_evtchn.h" -//#define DEBUG_PCI -#ifdef DEBUG_PCI -# define PCI_DPRINTF(format, ...) printf(format, ## __VA_ARGS__) -#else -# define PCI_DPRINTF(format, ...) do { } while (0) -#endif - bool pci_available = true; static char *pcibus_get_dev_path(DeviceState *dev); @@ -2439,12 +2432,12 @@ static void pci_patch_ids(PCIDevice *pdev, uint8_t *ptr, uint32_t size) /* Only a valid rom will be patched. */ rom_magic = pci_get_word(ptr); if (rom_magic != 0xaa55) { - PCI_DPRINTF("Bad ROM magic %04x\n", rom_magic); + trace_pci_bad_rom_magic(rom_magic, 0xaa55); return; } pcir_offset = pci_get_word(ptr + 0x18); if (pcir_offset + 8 >= size || memcmp(ptr + pcir_offset, "PCIR", 4)) { - PCI_DPRINTF("Bad PCIR offset 0x%x or signature\n", pcir_offset); + trace_pci_bad_pcir_offset(pcir_offset); return; } @@ -2453,8 +2446,8 @@ static void pci_patch_ids(PCIDevice *pdev, uint8_t *ptr, uint32_t size) rom_vendor_id = pci_get_word(ptr + pcir_offset + 4); rom_device_id = pci_get_word(ptr + pcir_offset + 6); - PCI_DPRINTF("%s: ROM id %04x%04x / PCI id %04x%04x\n", pdev->romfile, - vendor_id, device_id, rom_vendor_id, rom_device_id); + trace_pci_rom_and_pci_ids(pdev->romfile, vendor_id, device_id, + rom_vendor_id, rom_device_id); checksum = ptr[6]; @@ -2462,7 +2455,7 @@ static void pci_patch_ids(PCIDevice *pdev, uint8_t *ptr, uint32_t size) /* Patch vendor id and checksum (at offset 6 for etherboot roms). */ checksum += (uint8_t)rom_vendor_id + (uint8_t)(rom_vendor_id >> 8); checksum -= (uint8_t)vendor_id + (uint8_t)(vendor_id >> 8); - PCI_DPRINTF("ROM checksum %02x / %02x\n", ptr[6], checksum); + trace_pci_rom_checksum_change(ptr[6], checksum); ptr[6] = checksum; pci_set_word(ptr + pcir_offset + 4, vendor_id); } @@ -2471,7 +2464,7 @@ static void pci_patch_ids(PCIDevice *pdev, uint8_t *ptr, uint32_t size) /* Patch device id and checksum (at offset 6 for etherboot roms). */ checksum += (uint8_t)rom_device_id + (uint8_t)(rom_device_id >> 8); checksum -= (uint8_t)device_id + (uint8_t)(device_id >> 8); - PCI_DPRINTF("ROM checksum %02x / %02x\n", ptr[6], checksum); + trace_pci_rom_checksum_change(ptr[6], checksum); ptr[6] = checksum; pci_set_word(ptr + pcir_offset + 6, device_id); } diff --git a/hw/pci/trace-events b/hw/pci/trace-events index 6a9968962f..02c80d3ec8 100644 --- a/hw/pci/trace-events +++ b/hw/pci/trace-events @@ -6,6 +6,10 @@ pci_pm_transition(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, u pci_update_mappings_del(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size) "%s %02x:%02x.%x %d,0x%"PRIx64"+0x%"PRIx64 pci_update_mappings_add(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size) "%s %02x:%02x.%x %d,0x%"PRIx64"+0x%"PRIx64 pci_route_irq(int dev_irq, const char *dev_path, int parent_irq, const char *parent_path) "IRQ %d @%s -> IRQ %d @%s" +pci_bad_rom_magic(uint16_t bad_rom_magic, uint16_t good_rom_magic) "Bad ROM magic number: %04"PRIX16". Should be: %04"PRIX16 +pci_bad_pcir_offset(uint16_t pcir_offset) "Bad PCIR offset 0x%"PRIx16" or signature" +pci_rom_and_pci_ids(char *romfile, uint16_t vendor_id, uint16_t device_id, uint16_t rom_vendor_id, uint16_t rom_device_id) "%s: ROM ID %04"PRIx16":%04"PRIx16" | PCI ID %04"PRIx16":%04"PRIx16 +pci_rom_checksum_change(uint8_t old_checksum, uint8_t new_checksum) "ROM checksum changed from %02"PRIx8" to %02"PRIx8 # pci_host.c pci_cfg_read(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, unsigned offs, unsigned val) "%s %02x:%02x.%x @0x%x -> 0x%x" From patchwork Wed May 7 18:03:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 888086 Delivered-To: patch@linaro.org Received: by 2002:a5d:4683:0:b0:38f:210b:807b with SMTP id u3csp515083wrq; Wed, 7 May 2025 11:07:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW2L17FCmTjyNCOY6Ll6CQWGJ0/GQa/Iuzv/wMY+8WNJn/wEWLSAMJvhClCBpSRjx2wRf9WIA==@linaro.org X-Google-Smtp-Source: AGHT+IEtEz3kLZx/Szz+d7lFYYJ7nor0TZjXG+XN7zG8MYp93F2isVs3er1p93h6bZJtbRGrId39 X-Received: by 2002:ac8:5e50:0:b0:476:add4:d2ca with SMTP id d75a77b69052e-494495d9f42mr3732161cf.24.1746641245595; Wed, 07 May 2025 11:07:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746641245; cv=none; d=google.com; s=arc-20240605; b=ducZ1XijypWXdcH8S7BxQzQQ6O+WHi7pxPOD4Ih2/obKUHdszqhiECGJSfT47sWo/G y8mUE4586sTSsFXqisVRXf7eLh3342LVGGFYMGNPXkanNNbxTxDdwV7gimSAB0QhM2gQ C6cc9yjna3Cwo+sdCskmKlinpyVcfsoai7HO2kSV1kfbnD9KUGoEQJ8MdDvlS6FoCCI/ GOtqEMlha76Ck0lWrRYsUKyz2yizE27+K22U38ALHaSwJmAOtfqhzziP3lXpIXCpo6Yt pQJSe06uh9GYT559VvxDY/1+lvi2aSDaj7FF62A+fB1GPR26ixcGoGlbJ8lz+U7Xw736 3FVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=itQO7WH+r+hp/Y5SG94atpOr5trYxHHXqovU79LBu7s=; fh=IwCXGV4wPY6ObB9cIuDHqEqMPAzAKMp05WxPgfySCiA=; b=XZS/zuChdRzzx5rMHztFu8FT1BLoIHQbYUu6TjeljMCXEmQKoRRfPhpzbCzwyABvoa w4Fkh7E+sGF8uYIrBGrWgBSlhlHoBtfTGQr0GXbeXOojkaNDSiQPqu0LO2hrGjvKa2vU IYFnlT9t/R5JmQTp6aizT+FIMfUuN55roubiu04dmnLKquKMvgcpM/NPh0hh1ojC5DUb UMr9Lef0gl5qxabsLywH7U0JqpKo/EprXDLVf59DHEdLFo6AFTS8JFfR2VpDXx3oNYHL 6z8cufYdTJKpENw80SmWB1OJTt3eEev+/v5RoDxy3H40BoHbc3y7NgRUbJ3XaOUvTAjh sULQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-49223457d9dsi24263621cf.534.2025.05.07.11.07.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 May 2025 11:07:25 -0700 (PDT) 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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCj84-000878-2W; Wed, 07 May 2025 14:04:24 -0400 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 1uCj82-00086U-Qb; Wed, 07 May 2025 14:04:22 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCj81-00089k-4k; Wed, 07 May 2025 14:04:22 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id F3F8111FEF8; Wed, 07 May 2025 21:03:59 +0300 (MSK) Received: from think4mjt.origo (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id C61CF2066FD; Wed, 7 May 2025 21:04:12 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Gustavo Romero , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 03/21] hw/isa/ich9: Remove stray empty comment Date: Wed, 7 May 2025 21:03:54 +0300 Message-Id: <20250507180412.182797-4-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250507180412.182797-1-mjt@tls.msk.ru> References: <20250507180412.182797-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 From: Gustavo Romero Remove stray empty comment in IRQ routing function. Signed-off-by: Gustavo Romero Reviewed-by: Michael Tokarev Signed-off-by: Michael Tokarev --- hw/isa/lpc_ich9.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 71afb45b63..304dffac32 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -182,7 +182,6 @@ static uint64_t ich9_cc_read(void *opaque, hwaddr addr, } /* IRQ routing */ -/* */ static void ich9_lpc_rout(uint8_t pirq_rout, int *pic_irq, int *pic_dis) { *pic_irq = pirq_rout & ICH9_LPC_PIRQ_ROUT_MASK; From patchwork Wed May 7 18:03:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 888079 Delivered-To: patch@linaro.org Received: by 2002:a5d:4683:0:b0:38f:210b:807b with SMTP id u3csp513926wrq; Wed, 7 May 2025 11:05:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUZGzT2oBOMZHN+LiN6v9s/f7HZZQeFNWevu3BuJ4L1zF6BvuEQEWbzPPc5h8FhddToU1h3Iw==@linaro.org X-Google-Smtp-Source: AGHT+IERsuzrylKco1pe/XPE0Z0Jfs0TSxdLvET8tsSuqb7FMa4KrOiqTMol/5dwziv+i5YIdY13 X-Received: by 2002:a05:622a:1b04:b0:48b:4126:8f3f with SMTP id d75a77b69052e-494494caeb4mr4884071cf.0.1746641115038; Wed, 07 May 2025 11:05:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746641115; cv=none; d=google.com; s=arc-20240605; b=B9IpllYefAMP6QSkrNnyBfR1knD35x+AGBjPBq0RcSzQUQQApWFlczMv/HCcm9txTv vqFy4yww4c1YBC+LOj2hdodcoPnPERz89veO1ghJWeAW4hWzR7bHytr+LyA0cXNjhWbU ROlCCGwUtTRsQJmejgK1h4QwTpaF0yPC1qCL/wytCESDUaHzi3DN3UnyFiPJTjH/tork 4pSyE6FPYyla3lHYSpvxVPBcTCIV5E7m3YgyOoZ9gEGrwztnZGj0B6n40eyzoZ122fLi hbBkm1KKpB6wlM6LWdHwFgRMbNN7lLOXHqgUmTz11Xv3GYOHHpkvhTTzxklIgsdtqQ8A +zSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=JFIlXfVIORY8i0h4XvGhBuf1eR/lnLQOarQOIWlz9Qs=; fh=IwCXGV4wPY6ObB9cIuDHqEqMPAzAKMp05WxPgfySCiA=; b=NV0vuFBzVy4AX37EdYOjh/Cufe/+tjitMU98yFhvcNHYegabrDHlXxoUDgZL7adPXo WC5JJ8d0QDLP0zYy/66/MrnSnm50NUXJNk/tdjY8QU9PTrIJ2jtjzv1XDfmnpnCdu6iF 6vV6RKR/fKSpwMO6ei+F7JaZ0+MssrNWi2IX8LhfDWvxQMhSa6Updq1sV8ofdOCEqre0 wivVMpg2yTe3VUubIjayfH7YjjlyBG6e+lTb5hWJfeENb4RsgJDp1A0093uVr+DmZEbE IJLUZiO1FWvWes5YOmiY42nLZ74JyMvZuSuUPYWdHqtLYKgSeKBACL+pQgjnCoRH+D9f gEqA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-49223927212si25408351cf.628.2025.05.07.11.05.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 May 2025 11:05:15 -0700 (PDT) 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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCj8D-0008AJ-2S; Wed, 07 May 2025 14:04:33 -0400 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 1uCj88-00088K-0r; Wed, 07 May 2025 14:04:28 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCj84-0008A8-B7; Wed, 07 May 2025 14:04:27 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 125FA11FEF9; Wed, 07 May 2025 21:04:00 +0300 (MSK) Received: from think4mjt.origo (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id D8D532066FE; Wed, 7 May 2025 21:04:12 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Gustavo Romero , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 04/21] hw/i386/acpi-build: Fix typo and grammar in comment Date: Wed, 7 May 2025 21:03:55 +0300 Message-Id: <20250507180412.182797-5-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250507180412.182797-1-mjt@tls.msk.ru> References: <20250507180412.182797-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 From: Gustavo Romero Fix typo and verb conjugation in a comment about FADT initialization. Signed-off-by: Gustavo Romero Reviewed-by: Michael Tokarev Signed-off-by: Michael Tokarev --- hw/i386/acpi-build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 3fffa4a332..b5836417a0 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -139,7 +139,7 @@ static void init_common_fadt_data(MachineState *ms, Object *o, /* * "ICH9-LPC" or "PIIX4_PM" has "smm-compat" property to keep the old * behavior for compatibility irrelevant to smm_enabled, which doesn't - * comforms to ACPI spec. + * conform to the ACPI spec. */ bool smm_enabled = object_property_get_bool(o, "smm-compat", NULL) ? true : x86_machine_is_smm_enabled(x86ms); From patchwork Wed May 7 18:03:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 888077 Delivered-To: patch@linaro.org Received: by 2002:a5d:4683:0:b0:38f:210b:807b with SMTP id u3csp513884wrq; Wed, 7 May 2025 11:05:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXrlnWkVbw3AY4Ha9EzxPxvFDzrLkexuFtlYgj3ZRuBOFKWkHFCYD7yxaL4FPP6UCCqBA3EUQ==@linaro.org X-Google-Smtp-Source: AGHT+IHUL1Oqn/Y8FBGsLUclClE+Fa1A2cxoO78pZzbaOOfNK72jyj1XfoNF5AyitEXfsV23ddo3 X-Received: by 2002:a5d:5887:0:b0:3a0:9fe1:c298 with SMTP id ffacd0b85a97d-3a0b4a161b7mr3644467f8f.18.1746641110704; Wed, 07 May 2025 11:05:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746641110; cv=none; d=google.com; s=arc-20240605; b=QFnuQaMICeBSzn3rewir1de9KvH1Y+69sdzZuGBFkrk4pmWqkLywRPdYL+6pXRay0T Eq0DbWlNbVJry/ijNUYpJUykZcjdHHA3jDjvklxV/+G/Mn4hTajfm73foX6z4NCXb6w9 pdc2SLfmMIR0v9AosBFOCV2fdJZGiousO0+Z6mweciK2p6LUB+OmA1MEH+TrH5gHKnWT RPmUtLyebvr59JEu/657cAR3grTqPXFtnWg/Z4SBtIgD2oEec/ghWW6c4UYBQHM62fxx QT0jCG5draFFvj1ITsOmV184uGVSTCKypLtGc+o+Oj6mc0QrWYSmgkqGjS5kO4qI2EKO tItg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=LovVzEkFt7xpiAu7wAwjl1Qs/3tINfLg2TznI9S20Oc=; fh=IwCXGV4wPY6ObB9cIuDHqEqMPAzAKMp05WxPgfySCiA=; b=YTOS6DAy4G+M1ee69VsN7CUSDximZnnPIEl75MPZAwbvP0MHkDHyvwPdIkcnpm8rpg 73GJKnVFughWvXhwClxzfLv84L2BCRSHIF2qHxVpgy3Lah660sscuLriwIbwW9/2o8wR rS4mz+/xmbsz7RPmgGhFU8531FDlqWAj0kjZ/vsUre5EaQ3u+38UNqp5KtKuiCZP9UFj HnbQU2r2QTNJWgqG7psmfsBye3IV62kqkjNvLkO1wfKUbDaQwiVTUJyZXcU7csXv03nh mtZIJ6VjooWNnd19bv5nh0y5+jxwk8XF8Mj/VM25xannzf9l7vxQCAZkW0omqiCE7uI1 PNPA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-3a0b95dc70bsi286285f8f.569.2025.05.07.11.05.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 May 2025 11:05:10 -0700 (PDT) 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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCj8H-0008DJ-6X; Wed, 07 May 2025 14:04:37 -0400 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 1uCj88-00088M-F8; Wed, 07 May 2025 14:04:28 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCj85-0008AH-Up; Wed, 07 May 2025 14:04:28 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 240E911FEFA; Wed, 07 May 2025 21:04:00 +0300 (MSK) Received: from think4mjt.origo (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id EB4F42066FF; Wed, 7 May 2025 21:04:12 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Gustavo Romero , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 05/21] hw/i386/acpi-build: Update document reference Date: Wed, 7 May 2025 21:03:56 +0300 Message-Id: <20250507180412.182797-6-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250507180412.182797-1-mjt@tls.msk.ru> References: <20250507180412.182797-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 From: Gustavo Romero Update the reference for QEMU's ACPI PCI hotplug device interface. Also, use the possessive form in the comment. Signed-off-by: Gustavo Romero Reviewed-by: Michael Tokarev Signed-off-by: Michael Tokarev --- hw/i386/acpi-build.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/acpi-build.h b/hw/i386/acpi-build.h index 0dce155c8c..275ec058a1 100644 --- a/hw/i386/acpi-build.h +++ b/hw/i386/acpi-build.h @@ -5,7 +5,7 @@ extern const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio; -/* PCI Hot-plug registers bases. See docs/spec/acpi_pci_hotplug.txt */ +/* PCI Hot-plug registers' base. See docs/specs/acpi_pci_hotplug.rst */ #define ACPI_PCIHP_SEJ_BASE 0x8 #define ACPI_PCIHP_BNMR_BASE 0x10 From patchwork Wed May 7 18:03:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 888085 Delivered-To: patch@linaro.org Received: by 2002:a5d:4683:0:b0:38f:210b:807b with SMTP id u3csp514735wrq; Wed, 7 May 2025 11:06:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUeCl3kKQKv4oHTg9jC35aMdH1vp/G+7LIBjpSU43gy6F9h5510qXaSA0KBfTk06owp0kLetw==@linaro.org X-Google-Smtp-Source: AGHT+IEcSb1BCywu92aWme00JkohsSwMQ+5bCXfWGFQ7Ke8oP45T0llWRndmuRQSe3M4VWRRPEEd X-Received: by 2002:a05:620a:4891:b0:7c7:694e:1ba0 with SMTP id af79cd13be357-7caf73fdb46mr684914685a.44.1746641205859; Wed, 07 May 2025 11:06:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746641205; cv=none; d=google.com; s=arc-20240605; b=Dqx4SWpCT52xOSpF6HZEaTV7+wCBFwE/2QwtL2EKf70uRxsPQGPozkNIZqUe5J2IPq KwKKWSIX2Tj7jh1UXHUPAI+ZBvD5ib7U4JSbZmkZOX82BFSXQSCvm8wIqDEiTvAXD7XX o9npknGP4Kx+/1pioMtON5zFPUCwZYkcHU5DXvOYl2xC5FOFQcBoIyRYRHaHPL/kIMAO 77DWZmrmS5XsujbDuqJ3rI8znD2Hs1FqbzaJvssYk2X00i5VFZGcn4Dial58cdvu3RPv qae5elRDCtusSsHCUq1Ufb9P34OH1P/twAOu5Rf36N1Qzhcs8HA51uoFGMTQr3eqh7KD /BnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=zowgzkLcZbu4uM1lC7hMGx2wqyEdXYgxko4OxnI+/vI=; fh=IwCXGV4wPY6ObB9cIuDHqEqMPAzAKMp05WxPgfySCiA=; b=QEHJhGetab6FQ9NYgV74rOC0BZeREDzheE83ollLDW8uLU+pXEFZdP6wfU9KzFzE9x Fky5Cw4FHRez3E2DEY/YWWslYQIAYlI2p1hF1WER5w0CsIA85gY3b7WuFlV+KCl2lSwS sDUFmf+c2mOSmhZO25ky1F1gG36pulQDR569iYQZj+0x4clp4S9O9eqUjKkYNQx0TK91 GxqFw30HwZIC5kVpZp7d78H723PGWxF6KYdKZU6n/He/Ma5+Ca1x3TKyzPsMolzU/Oyx swYzMvWnroTsNim/RNx9JgufQ5FJc+b0EAfAiTTjNyI35HXS27gCyQ+Gx6kTXJDu+3bi GuRg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7caf751e7f9si252522585a.70.2025.05.07.11.06.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 May 2025 11:06:45 -0700 (PDT) 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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCj8X-0008FR-Bc; Wed, 07 May 2025 14:04:55 -0400 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 1uCj8B-00089O-NK; Wed, 07 May 2025 14:04:31 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCj89-0008Ay-Th; Wed, 07 May 2025 14:04:31 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 36AD911FEFB; Wed, 07 May 2025 21:04:00 +0300 (MSK) Received: from think4mjt.origo (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 09157206700; Wed, 7 May 2025 21:04:13 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Gustavo Romero , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 06/21] hw/acpi/ich9: Remove ICH9_DEBUG macro Date: Wed, 7 May 2025 21:03:57 +0300 Message-Id: <20250507180412.182797-7-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250507180412.182797-1-mjt@tls.msk.ru> References: <20250507180412.182797-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 From: Gustavo Romero Remove the ICH9_DEBUG macro, which is only used to dump the value of the pm_io_base parameter, passed to ich9_pm_iospace_update(). It provides little to no value and is not worth converting to a trace event. Signed-off-by: Gustavo Romero Reviewed-by: Michael Tokarev Signed-off-by: Michael Tokarev --- hw/acpi/ich9.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index c7a735bf64..9c0b7437b7 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -41,15 +41,6 @@ #include "hw/mem/pc-dimm.h" #include "hw/mem/nvdimm.h" -//#define DEBUG - -#ifdef DEBUG -#define ICH9_DEBUG(fmt, ...) \ -do { printf("%s "fmt, __func__, ## __VA_ARGS__); } while (0) -#else -#define ICH9_DEBUG(fmt, ...) do { } while (0) -#endif - static void ich9_pm_update_sci_fn(ACPIREGS *regs) { ICH9LPCPMRegs *pm = container_of(regs, ICH9LPCPMRegs, acpi_regs); @@ -135,8 +126,6 @@ static const MemoryRegionOps ich9_smi_ops = { void ich9_pm_iospace_update(ICH9LPCPMRegs *pm, uint32_t pm_io_base) { - ICH9_DEBUG("to 0x%x\n", pm_io_base); - assert((pm_io_base & ICH9_PMIO_MASK) == 0); pm->pm_io_base = pm_io_base; From patchwork Wed May 7 18:03:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 888083 Delivered-To: patch@linaro.org Received: by 2002:a5d:4683:0:b0:38f:210b:807b with SMTP id u3csp514233wrq; Wed, 7 May 2025 11:05:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVC6YIBhohUvZda97RcY5YkDxh2lF320uYMgCdeQ9LCBGlQBNWTrqEYvbeD2iWGlLBe3kGW9g==@linaro.org X-Google-Smtp-Source: AGHT+IFQGq+jPF5ESUWbP/HWFaKa93rfvRs7q5UpVuKR3MaghT/trVLsArIyx+SInAPjturr2IIq X-Received: by 2002:a05:622a:2b43:b0:489:6712:3e0b with SMTP id d75a77b69052e-4944924da45mr7950121cf.14.1746641148856; Wed, 07 May 2025 11:05:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746641148; cv=none; d=google.com; s=arc-20240605; b=AJwrkj/q1grogC51W6d7wS9M6Mg4rIfYW6LKvPfkGUlANLqWzNGiZLs61Odl0w3Pwx 7YC6qp1qMCzqzn/qCQ+Yi01K/KPhsrMg6kjLU/yBsYt58UTlQaAf2JhTP+Mso550nZeq iXqjOI3mlme12UTsBQJc9fwj/82f3Ov77DCHeOmc7Y9nLsXjnGGhTwE8CBeuRZqcOaaJ +pT8no/CNaeeAjDjy3+ia3SBTdxujZtAQ0JKAAHR98rwTXRxp/rEqYGh+7JakWkaTfdd s0ZKb55JFbZVxe6RnLsw0i+1Vfthff+h5a3DaSA53LIKZJX3bvtt4g6XYinU9VRMt/79 Ptaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=R8XGokrfaBP/W26whn9GoLHN5C9LlitNjPwDIqRNyGs=; fh=IwCXGV4wPY6ObB9cIuDHqEqMPAzAKMp05WxPgfySCiA=; b=AGqAywyxn96f9DCD595f8BTw0qkHZsp4Fr245DbpS1I+2fL1zPFvebJ5/wFHVAIz/7 T8uY72Yfwp9kvdyCCDqn2FX/hXPyk9/DZLV8WfoAZqA2G+Fnjl5OL85sbYgKZHOxIhlf 8ZnwcXTsWBdQxO9+H/LnChdjx7SVZ3ZyEeNODdVsHYhjdHBiiMhtt+JIP/etVf1AvnAI AX6InX4ooiO7kwYbofnju5CicFyy888HYInD0dI/1wdZs+hzFkOITwK7qtE4MU+TjfUW Wjz6EUE6gZAWZtA7+Li91I1lGdW2Vuwzu1+zbVoW9gBjv6x0VqaBnEDPHWfwF7Ak8iiI OSpw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-49220f837b7si25916161cf.23.2025.05.07.11.05.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 May 2025 11:05:48 -0700 (PDT) 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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCj8D-0008AM-J8; Wed, 07 May 2025 14:04:34 -0400 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 1uCj8B-00089P-NP; Wed, 07 May 2025 14:04:31 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCj8A-0008B8-1u; Wed, 07 May 2025 14:04:31 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 3EB8311FEFC; Wed, 07 May 2025 21:04:00 +0300 (MSK) Received: from think4mjt.origo (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 1B7CB206701; Wed, 7 May 2025 21:04:13 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Gustavo Romero , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 07/21] hw/i386/acpi-build: Fix typo in function name Date: Wed, 7 May 2025 21:03:58 +0300 Message-Id: <20250507180412.182797-8-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250507180412.182797-1-mjt@tls.msk.ru> References: <20250507180412.182797-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 From: Gustavo Romero Fix missing "i" in the name of the function responsible for adding the call to the PCI notification method (PCNT) in the ACPI table. Signed-off-by: Gustavo Romero Reviewed-by: Eric Auger Reviewed-by: Michael Tokarev Signed-off-by: Michael Tokarev --- hw/i386/acpi-build.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index b5836417a0..f40ad062f9 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -589,8 +589,8 @@ void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus) } } -static bool build_append_notfication_callback(Aml *parent_scope, - const PCIBus *bus) +static bool build_append_notification_callback(Aml *parent_scope, + const PCIBus *bus) { Aml *method; PCIBus *sec; @@ -604,7 +604,7 @@ static bool build_append_notfication_callback(Aml *parent_scope, continue; } nr_notifiers = nr_notifiers + - build_append_notfication_callback(br_scope, sec); + build_append_notification_callback(br_scope, sec); /* * add new child scope to parent * and keep track of bus that have PCNT, @@ -1773,7 +1773,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, PCIBus *b = PCI_HOST_BRIDGE(pci_host)->bus; scope = aml_scope("\\_SB.PCI0"); - has_pcnt = build_append_notfication_callback(scope, b); + has_pcnt = build_append_notification_callback(scope, b); if (has_pcnt) { aml_append(dsdt, scope); } From patchwork Wed May 7 18:03:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 888080 Delivered-To: patch@linaro.org Received: by 2002:a5d:4683:0:b0:38f:210b:807b with SMTP id u3csp514004wrq; Wed, 7 May 2025 11:05:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVYz2NDQtJ2G0zvFNzDww8hUHclRO1OI4RXxKiINsXzmsEeNROEykBhR/0uA7x48iKYpPJQ5A==@linaro.org X-Google-Smtp-Source: AGHT+IEZDTapXoi2WyRVJ2cdgqdCYhGO6IGeW0K1b4HU9BcPS6w6v92roZb/68CoKk8uGXcDIAtP X-Received: by 2002:a05:6214:f04:b0:6e4:4484:f35b with SMTP id 6a1803df08f44-6f542a81661mr68631476d6.30.1746641123962; Wed, 07 May 2025 11:05:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746641123; cv=none; d=google.com; s=arc-20240605; b=Jwg8kDVIC1cwJMGxuCdMn9iCzNihqabQZAMx7XXkT6fYj2+pRnjBtskeM554JWz0W7 rYlR088/eudmLuXEDJk4+7R/ejnjDwxAjKiSBO71ro+ZVtyUjnFW/KJ11J7jTm1vskV8 SMJLxNMIvyKpNWgjCbMnsYooZyBBPBg1z4eIApJ6PWboov6OShYuKKKgJicmjPW/4FNm K1FsO58XaOa2FyK6IPsXHOKuv9g69/WutUfbuc5znmDfmEAhKrS0oE/R9kMpa0NRGSVp jCR/P5lvWhHbeBGbpFaCtZS210FXuGUIdTyUb5VgR9nOI1vlS6NCUyOgWy3svABdpOrI FusA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=IVqRHfbrXphm2FvAdYBciMuF9qa/lYle0VSx7JFSoUE=; fh=IwCXGV4wPY6ObB9cIuDHqEqMPAzAKMp05WxPgfySCiA=; b=A7L8R80eiRzj/CgvK36O5s9dmMbLxOG3Gera9LKcJxIH8fwx/0VODUHZC0azoPbOIa ypqA/sTdLso5wWbJ9bSHMg3z3IOUWX1vurIHsg8qFWlUGjqefIeBIj0joOFqOdYBupwn 0RjS34lCVpTUaQca0xvot9yo+MJf1Z4mIQJ27F6jwucr3VKqO6FsuJy0f0gjJdwkc9ma XVhms1hnFOx/yB4Ym3a7lU90IS/h56waPXVzZ35MJeA4/ZKqQE25Q6opLRtIZFmO4019 g2t0qtamxSCbk9/4mHgO3wE4WROXtw1Dkc/FIozy0I5qDFYsMe1NrOoFN89IM3HXqMwz hfCA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f542626645si24159446d6.12.2025.05.07.11.05.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 May 2025 11:05:23 -0700 (PDT) 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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCj8W-0008FQ-03; Wed, 07 May 2025 14:04:54 -0400 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 1uCj8E-0008CQ-Nm; Wed, 07 May 2025 14:04:35 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCj8D-0008Bb-3d; Wed, 07 May 2025 14:04:34 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 474D411FEFD; Wed, 07 May 2025 21:04:00 +0300 (MSK) Received: from think4mjt.origo (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 23C8F206702; Wed, 7 May 2025 21:04:13 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Gustavo Romero , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 08/21] hw/core/machine: Fix indentation Date: Wed, 7 May 2025 21:03:59 +0300 Message-Id: <20250507180412.182797-9-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250507180412.182797-1-mjt@tls.msk.ru> References: <20250507180412.182797-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 From: Gustavo Romero Fix indentation for some elements in the hardware compat arrays. Signed-off-by: Gustavo Romero Reviewed-by: Thomas Huth Reviewed-by: Michael Tokarev Signed-off-by: Michael Tokarev --- hw/core/machine.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index ed01798d37..b8ae155dfa 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -41,7 +41,7 @@ GlobalProperty hw_compat_10_0[] = {}; const size_t hw_compat_10_0_len = G_N_ELEMENTS(hw_compat_10_0); GlobalProperty hw_compat_9_2[] = { - {"arm-cpu", "backcompat-pauth-default-use-qarma5", "true"}, + { "arm-cpu", "backcompat-pauth-default-use-qarma5", "true"}, { "virtio-balloon-pci", "vectors", "0" }, { "virtio-balloon-pci-transitional", "vectors", "0" }, { "virtio-balloon-pci-non-transitional", "vectors", "0" }, @@ -58,12 +58,12 @@ GlobalProperty hw_compat_9_1[] = { const size_t hw_compat_9_1_len = G_N_ELEMENTS(hw_compat_9_1); GlobalProperty hw_compat_9_0[] = { - {"arm-cpu", "backcompat-cntfrq", "true" }, + { "arm-cpu", "backcompat-cntfrq", "true" }, { "scsi-hd", "migrate-emulated-scsi-request", "false" }, { "scsi-cd", "migrate-emulated-scsi-request", "false" }, - {"vfio-pci", "skip-vsc-check", "false" }, + { "vfio-pci", "skip-vsc-check", "false" }, { "virtio-pci", "x-pcie-pm-no-soft-reset", "off" }, - {"sd-card", "spec_version", "2" }, + { "sd-card", "spec_version", "2" }, }; const size_t hw_compat_9_0_len = G_N_ELEMENTS(hw_compat_9_0); From patchwork Wed May 7 18:04:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 888087 Delivered-To: patch@linaro.org Received: by 2002:a5d:4683:0:b0:38f:210b:807b with SMTP id u3csp515907wrq; Wed, 7 May 2025 11:09:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVxFc3b1AyOCQr39SdJJv1Eb3rTcH0Oe1a9dTXx+FMuZkbLwTkAZFXTmTFrtzy/v+jRJxAeIQ==@linaro.org X-Google-Smtp-Source: AGHT+IFKkCtozj7hDiRFe3IfQM7ccfuBTEbfGIbpBnnZIivV2c952a4bpTLWMzwOhzKMVcXKBBZX X-Received: by 2002:a67:e707:0:b0:4c1:749b:2c27 with SMTP id ada2fe7eead31-4dc737fc761mr4116591137.14.1746641350049; Wed, 07 May 2025 11:09:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746641350; cv=none; d=google.com; s=arc-20240605; b=LVj3qfWEXQ2z5zg+sRRoQgCLPG19UUZo3P8tQ0O5p8n7amti8Ii+BzEtaRurotSPHr csOgeZv3exQ6RCy2Tr7DPO/SiHkYS+O4e+JdGbvEadiSCRNkXC7UAvGQvZff5Y4jph7u pid95dhz9+VmCVSeOSfhc/pVIFBqUZjwVj8Sw81mTOi3j66FOXwc4bt16D/OKSKeSOKo /E8HYzbiOtzxEJqAN66RXlDWw+zFRZutrrG9R6ccF6aLAIeSiz5wMFDylNTy1wFfkaAR 9HipFBuMBd1vyE2FGszUSBBIP8H1lykEIvWev9H8wXmChqWzAnsTJcUcWdsIcq1gE7fI VFqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=PoFUHUXzImsQ73TKG+/8sT5lTTJYGDivTj0hrdTVhzM=; fh=IwCXGV4wPY6ObB9cIuDHqEqMPAzAKMp05WxPgfySCiA=; b=Y5aklhLLzDCJBWqt/a9hjHsmyLp/wB5MT1dok0OvLuFZL0FbieaROM3ly0m/fKQFXb B1i5d+K2IrNrvtKYh8mxyU3mYxJuqsJmZ6WOTN8xOrKOhhnti5HnvY0ddneVw7gsfz+O dT5wm5k/Xdnrq4S6ns3Kn56N9//rAaMjD+yWBYgPSW4ld+B/4b6tzb880iYFn8fHawXb r9Kz6azkbjkgWCkJ5cQRB58I8/OozmkPXVJfGSE6viv54mGzld0ZCqxAuSNvPMmLztOS 6/I7nQOmLSwCYowx4yx4oQPqe6LaPtE7/GfSZDvFoNFcbNY+n8FshXr+9SUvT8/RfgY3 N4UA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ada2fe7eead31-4daf25855c6si3273381137.396.2025.05.07.11.09.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 May 2025 11:09:10 -0700 (PDT) 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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCj8X-0008FS-C2; Wed, 07 May 2025 14:04:55 -0400 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 1uCj8F-0008CT-2T; Wed, 07 May 2025 14:04:35 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCj8D-0008Bd-88; Wed, 07 May 2025 14:04:34 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 59E0C11FEFE; Wed, 07 May 2025 21:04:00 +0300 (MSK) Received: from think4mjt.origo (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 2C1B7206703; Wed, 7 May 2025 21:04:13 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Gustavo Romero , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 09/21] qom/object: Fix typo in comment Date: Wed, 7 May 2025 21:04:00 +0300 Message-Id: <20250507180412.182797-10-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250507180412.182797-1-mjt@tls.msk.ru> References: <20250507180412.182797-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 From: Gustavo Romero Fix duplicate preposition in comment. Signed-off-by: Gustavo Romero Reviewed-by: Thomas Huth Reviewed-by: Michael Tokarev Signed-off-by: Michael Tokarev --- qom/object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qom/object.c b/qom/object.c index 664f0f24ae..7b013f40a0 100644 --- a/qom/object.c +++ b/qom/object.c @@ -485,7 +485,7 @@ bool object_apply_global_props(Object *obj, const GPtrArray *props, * Slot 0: accelerator's global property defaults * Slot 1: machine's global property defaults * Slot 2: global properties from legacy command line option - * Each is a GPtrArray of of GlobalProperty. + * Each is a GPtrArray of GlobalProperty. * Applied in order, later entries override earlier ones. */ static GPtrArray *object_compat_props[3]; From patchwork Wed May 7 18:04:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 888082 Delivered-To: patch@linaro.org Received: by 2002:a5d:4683:0:b0:38f:210b:807b with SMTP id u3csp514099wrq; Wed, 7 May 2025 11:05:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV0ykXX9OEn69JvbQyXjfMD0dxUay/AdTGnVeyENCBnn0PTiFlDlquMrRM8tczuyOX+oINp2A==@linaro.org X-Google-Smtp-Source: AGHT+IFNlJdk4bYqa05sZ2IQ6Sq53+wM218gt++ffFdYdrgDHFRAOZ9mL3snugKf82ZOOXYRyJfi X-Received: by 2002:a5d:648d:0:b0:3a0:b294:ccf3 with SMTP id ffacd0b85a97d-3a0b4a65549mr3470720f8f.47.1746641133161; Wed, 07 May 2025 11:05:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746641133; cv=none; d=google.com; s=arc-20240605; b=hAZNv50fLlOUowgmRBbS4BUp0BAo85vAFAZmeajTiGkNNqbk50YmsXf0599kvlnjBZ PngmIpd5P91+mA3H6SRMZVe+VyMbnV/w1cL/LDegmEK5A+iEg/0KKIo8fLpY+MkivXYc 9Ay9/Gkh7rnbJvUmlzeagNN0gqtMhi727kTDu0TJrZaccV/vQoXZd/lwQmyQgvFPeobp hu/9Ma/MbiOY0AqOjpVu0ukE/sdX+EsZ7xUhapa0IOUquCC0yQp4sDaHDXEdWMYnmWZz o4ItBq0LlyVa3swZ5vKm6NIHM04rNYFPsJnzV8SmFQrzWE29ZMaEiE/JrgbYxaXKem3m Cq8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=ei/1KhQ7DKW1MGDM1vHjiQq4cz27UtNOPVztdbJ7LqA=; fh=IwCXGV4wPY6ObB9cIuDHqEqMPAzAKMp05WxPgfySCiA=; b=DyyMeeGfR3Koj98clctAH2vpqBHY8u37Upb7JprzSOsSVBAyQVPqX7eINCPFOHu3Gh WPUAxV739NKFNfy+JwmLan9ZyQ32ifCNdWhJP5V8zhvlZTJjTcJ/t9vmMts/jkIw9PGR k5LRqnhVS8OD1hvS+HwMx68LAmbCRy5leq10+89ZGpQgN97ehlyMdfTVG8bUKJEX6F6N ybaZiU9qKIoQCcKMeW3XpcR6tUO41GqNdtYC6/aa7fKOb76sAX2N6MLaEGiyJIm5sfRb B/+XMCz6jN2mh+T6o7eOlAblY8zhZunrtRirz7NL6chg2w9IT10bI682g3CXKUMRVX4E 72PQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-3a0b6358730si1285602f8f.229.2025.05.07.11.05.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 May 2025 11:05:33 -0700 (PDT) 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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCj8f-0008Mg-Pt; Wed, 07 May 2025 14:05:01 -0400 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 1uCj8J-0008Ds-LT; Wed, 07 May 2025 14:04:40 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCj8G-0008C7-69; Wed, 07 May 2025 14:04:39 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 6C67E11FEFF; Wed, 07 May 2025 21:04:00 +0300 (MSK) Received: from think4mjt.origo (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 3EB4C206704; Wed, 7 May 2025 21:04:13 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Gustavo Romero , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 10/21] hw/net/e1000: Remove stray empty comment in header Date: Wed, 7 May 2025 21:04:01 +0300 Message-Id: <20250507180412.182797-11-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250507180412.182797-1-mjt@tls.msk.ru> References: <20250507180412.182797-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 From: Gustavo Romero In the header file, remove a stray empty comment in the Offload Context Descriptor struct. Signed-off-by: Gustavo Romero Reviewed-by: Thomas Huth Reviewed-by: Michael Tokarev Signed-off-by: Michael Tokarev --- hw/net/e1000x_regs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/net/e1000x_regs.h b/hw/net/e1000x_regs.h index cd896fc0ca..e9a74de6f4 100644 --- a/hw/net/e1000x_regs.h +++ b/hw/net/e1000x_regs.h @@ -900,7 +900,7 @@ struct e1000_context_desc { uint16_t tucse; /* TCP checksum end */ } tcp_fields; } upper_setup; - uint32_t cmd_and_length; /* */ + uint32_t cmd_and_length; union { uint32_t data; struct { From patchwork Wed May 7 18:04:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 888084 Delivered-To: patch@linaro.org Received: by 2002:a5d:4683:0:b0:38f:210b:807b with SMTP id u3csp514433wrq; Wed, 7 May 2025 11:06:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU8wln5FBkBzPMU75iVial0G9tfTxMwQGLV1CcC+L/MSE6SmA+YtR5ML+TRSDIwnvVRI2slfA==@linaro.org X-Google-Smtp-Source: AGHT+IGIS+zUyebclShhz7kYr8l2XjgCXq0Z5VI8Mhq/mWZwOEHMhE3xJq17j8HKYH0PFtFTlbN3 X-Received: by 2002:a05:620a:c51:b0:7c5:65ab:4ff5 with SMTP id af79cd13be357-7ccf9e833c0mr38985285a.45.1746641172533; Wed, 07 May 2025 11:06:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746641172; cv=none; d=google.com; s=arc-20240605; b=afl7Cxdu9Bt8DVrT97wG9LGu4OOIUrSsG5wbooMPuml58PQb8J7o4z5zhFMKv3vlPF YXNA0zVmGZr8/fw/V0G6kWtd/dGhwmDorEO0+XLyh5b0Fmh6EimuFLD0ou5sqhN5zALt tCxfnXZh+p+s4yMC3VW6xIgD1CQQoynLil2bhgLcfdVZ/xrr50eGzbC0ghnfdB6lgXv0 65O2+h2Y2mszTizV6dkb8DTkDPvLrFE+8eTeGF1JCSwk1yFWfrjvXybNTQxD7ksQSptV eJ53/6EfqoD5XV1SedojoWga+nPscMSQLK6QAL6JHmwEGj0XVaRPHBRDvhNj4v6wO8Js 6Rrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=+6pfb06ufUxiMwnyu2ELngYcNeFuCAG22p5vlU8e6UA=; fh=IwCXGV4wPY6ObB9cIuDHqEqMPAzAKMp05WxPgfySCiA=; b=H1TR7R3L0B+cfmo6SEjHfWZ4bV2mVBPcq0ez1pmx1HlSmyVbxDunRoVSmb+c/Rzj34 AetufrIc8W81XIM1d9ce/XhKN0B5LOAlDl4hC3s0SeTRYGQOsejlvmoroUGb0PQzhudH ugi3Fb3zgy/CVCY7F0ZczxIo75yKO5nThso4aPRG6I33YS5t4o5Tjnjn5A04Zq9L61/w XsHvql3ciUsHSWzb1sr1CQXSX6GgvXpOZp50S+nJsiLhzkbKnQTVyeCi7lgKjt8Zpxmn hhrhyAdOeRfZ+1FXXHGVvUoWFYv0vKciyGcmipOsSaPBXScHQKTn8hQmhozOGJh6LF40 20dQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7caf75c694bsi267034185a.477.2025.05.07.11.06.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 May 2025 11:06:12 -0700 (PDT) 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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCj8p-000076-Rx; Wed, 07 May 2025 14:05:12 -0400 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 1uCj8j-0008Q2-3p; Wed, 07 May 2025 14:05:09 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCj8a-0008CF-Rr; Wed, 07 May 2025 14:05:03 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 7FE7411FF00; Wed, 07 May 2025 21:04:00 +0300 (MSK) Received: from think4mjt.origo (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 5158E206705; Wed, 7 May 2025 21:04:13 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Gustavo Romero , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 11/21] hw/pci-host/gpex-acpi: Fix typo in comment Date: Wed, 7 May 2025 21:04:02 +0300 Message-Id: <20250507180412.182797-12-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250507180412.182797-1-mjt@tls.msk.ru> References: <20250507180412.182797-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 From: Gustavo Romero Fix typo in a comment about the creation of the ACPI CRS method. Signed-off-by: Gustavo Romero Reviewed-by: Thomas Huth Reviewed-by: Michael Tokarev Signed-off-by: Michael Tokarev --- hw/pci-host/gpex-acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/pci-host/gpex-acpi.c b/hw/pci-host/gpex-acpi.c index e8b4c64c5f..0aba47c71c 100644 --- a/hw/pci-host/gpex-acpi.c +++ b/hw/pci-host/gpex-acpi.c @@ -182,7 +182,7 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg) /* * Resources defined for PXBs are composed of the following parts: - * 1. The resources the pci-brige/pcie-root-port need. + * 1. The resources the pci-bridge/pcie-root-port need. * 2. The resources the devices behind pxb need. */ crs = build_crs(PCI_HOST_BRIDGE(BUS(bus)->parent), &crs_range_set, From patchwork Wed May 7 18:04:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 888081 Delivered-To: patch@linaro.org Received: by 2002:a5d:4683:0:b0:38f:210b:807b with SMTP id u3csp514079wrq; Wed, 7 May 2025 11:05:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU+TGEFnxqW9QP4jckfVmIrz71BBZwLPmllG0N8VBGHkzinep0/UaKjoFOMJTOxqLbXkS5uVw==@linaro.org X-Google-Smtp-Source: AGHT+IHmfNjtSOlwUe6ClFTxQ7Tu4RnEycCYKnInh6WqnXEYiatmlHe7y5GNUKO2Vji82picAjIP X-Received: by 2002:a05:6000:2203:b0:39e:cbca:74cf with SMTP id ffacd0b85a97d-3a0b9908539mr490281f8f.6.1746641131299; Wed, 07 May 2025 11:05:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746641131; cv=none; d=google.com; s=arc-20240605; b=TtAMhLz5dlHSZTlOE0ZfRp10+wHxrtki3hsguFYOAqa42n63TdOX4Rmn4+JoK2Jh/6 XpZk5HCOh1P48AzYpusuXA1/qmuss9+5gpxO8oBQfJnH6qtB4F7DHpujqw7rbPhLXeue zudDtv+CXbFk10X1pV7Tj5nikR+CmcOwtQ7GdSjAxWDx94yl4c+W6MPVD4gzhzKve7TF h4402b6s/DhpPus14cs7CBzbAIzIWf/LF7+BvaSgbOCzQu/ETvF52fZfoeIrVNDgiD0S 46gBwrdZFko+C4Pf83oQoRYfPVjZ/lZk5FKC26SHf0QtYzYwzAGqDfibbQjdirg7T6PJ CDUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=EcIHXgb6AwPtVC73n1J97P1MvubIL2QJrzM4EYoNYMI=; fh=IwCXGV4wPY6ObB9cIuDHqEqMPAzAKMp05WxPgfySCiA=; b=F1yFqI/gr+mNZAHrkQz8aFxDQ0zefuwOQpV7F1/NZQPizcjdPxiVbRz7L95/XaOFLv Qi8KGue/f/q6yS1//D8aalmpu7BtebjRUc+l3iN7afoBOx0OYmF+1wrY0ln5Wm6RJy+E z/mESfxJqf6/7b78e/6PV6DxO6rAHP8f2vljwje/dRRUTSHue6DEGPTMRcyKKk7kc2Y4 zrrC1tU6HexrOrczJeE7/e5HgJI0Xs/x+bwarejU8dWC2gg41PJN1D5QkQEqWIAEbZiT Fld9zGenih/Aj2HB/ISPoXsTCRjHj6UVTIgaJDoykmQI4VmJe4jT0UJpDlP8KrWbILMH q7ww==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-3a099adf552si9211472f8f.5.2025.05.07.11.05.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 May 2025 11:05:31 -0700 (PDT) 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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCj8q-0000A3-Te; Wed, 07 May 2025 14:05:13 -0400 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 1uCj8j-0008Q3-3b; Wed, 07 May 2025 14:05:09 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCj8g-0008Cs-3c; Wed, 07 May 2025 14:05:03 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 88EC411FF01; Wed, 07 May 2025 21:04:00 +0300 (MSK) Received: from think4mjt.origo (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 656A8206706; Wed, 7 May 2025 21:04:13 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Gustavo Romero , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 12/21] hw/acpi/pcihp: Fix typo in function name Date: Wed, 7 May 2025 21:04:03 +0300 Message-Id: <20250507180412.182797-13-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250507180412.182797-1-mjt@tls.msk.ru> References: <20250507180412.182797-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 From: Gustavo Romero Fix typo in QEMU's ACPI PCI hotplug API function name that checks whether a given bus is hotplug-capable. Signed-off-by: Gustavo Romero Reviewed-by: Eric Auger Reviewed-by: Michael Tokarev Signed-off-by: Michael Tokarev --- hw/acpi/acpi-pci-hotplug-stub.c | 2 +- hw/acpi/ich9.c | 2 +- hw/acpi/pcihp.c | 2 +- hw/acpi/piix4.c | 2 +- include/hw/acpi/pcihp.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/acpi/acpi-pci-hotplug-stub.c b/hw/acpi/acpi-pci-hotplug-stub.c index b67b4a92da..b7bc6e40a1 100644 --- a/hw/acpi/acpi-pci-hotplug-stub.c +++ b/hw/acpi/acpi-pci-hotplug-stub.c @@ -34,7 +34,7 @@ void acpi_pcihp_reset(AcpiPciHpState *s) { } -bool acpi_pcihp_is_hotpluggbale_bus(AcpiPciHpState *s, BusState *bus) +bool acpi_pcihp_is_hotpluggable_bus(AcpiPciHpState *s, BusState *bus) { return true; } diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 9c0b7437b7..967b67485e 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -559,7 +559,7 @@ void ich9_pm_device_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, bool ich9_pm_is_hotpluggable_bus(HotplugHandler *hotplug_dev, BusState *bus) { ICH9LPCState *lpc = ICH9_LPC_DEVICE(hotplug_dev); - return acpi_pcihp_is_hotpluggbale_bus(&lpc->pm.acpi_pci_hotplug, bus); + return acpi_pcihp_is_hotpluggable_bus(&lpc->pm.acpi_pci_hotplug, bus); } void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list) diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index 5f79c9016b..aac90013d4 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -371,7 +371,7 @@ void acpi_pcihp_device_unplug_request_cb(HotplugHandler *hotplug_dev, acpi_send_event(DEVICE(hotplug_dev), ACPI_PCI_HOTPLUG_STATUS); } -bool acpi_pcihp_is_hotpluggbale_bus(AcpiPciHpState *s, BusState *bus) +bool acpi_pcihp_is_hotpluggable_bus(AcpiPciHpState *s, BusState *bus) { Object *o = OBJECT(bus->parent); diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index b16d45f03e..d98b80df6d 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -406,7 +406,7 @@ static bool piix4_is_hotpluggable_bus(HotplugHandler *hotplug_dev, BusState *bus) { PIIX4PMState *s = PIIX4_PM(hotplug_dev); - return acpi_pcihp_is_hotpluggbale_bus(&s->acpi_pci_hotplug, bus); + return acpi_pcihp_is_hotpluggable_bus(&s->acpi_pci_hotplug, bus); } static void piix4_pm_machine_ready(Notifier *n, void *opaque) diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h index ac21a95913..a97904bada 100644 --- a/include/hw/acpi/pcihp.h +++ b/include/hw/acpi/pcihp.h @@ -58,7 +58,7 @@ typedef struct AcpiPciHpState { void acpi_pcihp_init(Object *owner, AcpiPciHpState *, PCIBus *root, MemoryRegion *io, uint16_t io_base); -bool acpi_pcihp_is_hotpluggbale_bus(AcpiPciHpState *s, BusState *bus); +bool acpi_pcihp_is_hotpluggable_bus(AcpiPciHpState *s, BusState *bus); void acpi_pcihp_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp); void acpi_pcihp_device_plug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s,