From patchwork Thu Feb 22 11:25:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 774846 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp715329wrw; Thu, 22 Feb 2024 03:29:01 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWpa6IW/XUxuHhExfquVG3OuSXXH6rqmv0vLOD/HD3CDAEWkxnAw773OQkIntR483o6F2wrjeROYi25vcYLr23i X-Google-Smtp-Source: AGHT+IGHGuqMG4QNp2f4JJ8Jymv3+Yqte2z47RmzxWFBRbTiYyvkD7e/1CMbiDUebX1i8l512rnA X-Received: by 2002:a0c:fb51:0:b0:68f:52e6:e59a with SMTP id b17-20020a0cfb51000000b0068f52e6e59amr3105406qvq.27.1708601341662; Thu, 22 Feb 2024 03:29:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708601341; cv=none; d=google.com; s=arc-20160816; b=T1Rw4cScfoEAmpeMsqMEd0LX2oQ9CHN+77ZOYHMg5x18bNH2o/gWb0Z8Gn4+xjyema tdBdMnE5kh2N7h0GK+aVZJFK5XD+yAHIjzhgQOm8sKGjHDhH9RxR5ONz9jxzMxooNLv/ b++BC+n359Z7K03imqztvjYBYm6qix9r8hADweeweKhIqEDJrbJ+tqU5KVzutyp+qxst +ZPoM3yHN2X3BvkoxlflVLUmtCnBHx12of3pfgw1fSy/9eSKTQ/gIprgdx9k3/QcCGOG M0Wj9N6MumiNtIEPFc75yn4uMs/QbOkeqVKpAu13uzboG7se9R1fWj11Y8r3dTHJGzYB lA9g== 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; bh=co1NGhzmOvdt45RKPI29br3iTmYE75LYhFXzmPjJ8wI=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=m3Sh2+bCK5B4kssFMucMv9kjslNfgHdx/CEp7nQm/+Ei7KokYd7HaxdfzoZENnOB6D V9hCckfgQv99RADZUx8wacaRdZTTOlThNca9P4pM//eiTh2CZlsjx0RkqFcga/TJn2V7 qKlP5FfxewctRfD8Abj4HSdn7o+22rkO28c+PX1nBBoDq5JNB+0+y7YuUVSDqHOviWmJ SZeJJdoaeVC0rIvIBV0DPIEm6TO+1EKqaarW0HXGLspDN48fJeXLt3/LzSUPtBRzGSli j1i1FBpopgrZPG1sJVIZLfZl7EYi2BFsC/+e8Z0wB2tYeUyDqG3W8uupMviZe7MjTJur 3LnA==; 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 i14-20020ad45c6e000000b0068f65c8e094si9422938qvh.299.2024.02.22.03.29.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Feb 2024 03:29:01 -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; 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 1rd7E5-0008Bt-6U; Thu, 22 Feb 2024 06:26:53 -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 1rd7DR-00083N-76; Thu, 22 Feb 2024 06:26:13 -0500 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 1rd7DK-0004p1-Tv; Thu, 22 Feb 2024 06:26:12 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 701CB4FB43; Thu, 22 Feb 2024 14:26:25 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id EB40A8716F; Thu, 22 Feb 2024 14:26:01 +0300 (MSK) Received: (nullmailer pid 2526143 invoked by uid 1000); Thu, 22 Feb 2024 11:26:01 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 01/34] hw/usb: Style cleanup Date: Thu, 22 Feb 2024 14:25:28 +0300 Message-Id: <20240222112601.2526057-2-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240222112601.2526057-1-mjt@tls.msk.ru> References: <20240222112601.2526057-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, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=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 From: Philippe Mathieu-Daudé We are going to modify these lines, fix their style in order to avoid checkpatch.pl warning. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev --- hw/usb/hcd-ehci.c | 3 ++- hw/usb/hcd-uhci.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 870c72cb59..98a2860069 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -1086,8 +1086,9 @@ static void ehci_opreg_write(void *ptr, hwaddr addr, case CONFIGFLAG: val &= 0x1; if (val) { - for(i = 0; i < NB_PORTS; i++) + for (i = 0; i < NB_PORTS; i++) { handle_port_owner_write(s, i, 0); + } } break; diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index 7d3c026dae..b95b47f6a4 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -457,8 +457,9 @@ static void uhci_port_write(void *opaque, hwaddr addr, int n; n = (addr >> 1) & 7; - if (n >= NB_PORTS) + if (n >= NB_PORTS) { return; + } port = &s->ports[n]; dev = port->port.dev; if (dev && dev->attached) { @@ -513,8 +514,9 @@ static uint64_t uhci_port_read(void *opaque, hwaddr addr, unsigned size) UHCIPort *port; int n; n = (addr >> 1) & 7; - if (n >= NB_PORTS) + if (n >= NB_PORTS) { goto read_default; + } port = &s->ports[n]; val = port->ctrl; } From patchwork Thu Feb 22 11:25:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 774853 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp716270wrw; Thu, 22 Feb 2024 03:31:17 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVSrw1+B+7GnsYwNFrQfFerndT4maxwWy9jveLVoa/pnSM+0YcHLGAwG2pNA3aiP7qBO9JLPCNWsYrItJ66S16U X-Google-Smtp-Source: AGHT+IHRyiPgBV9zfJ0rZnz9VBmaxTpcryGOBK3b6ukqXBXflrvdgLs1xDRUvRIfgP7l3kC29HKq X-Received: by 2002:ae9:e013:0:b0:787:21f3:5dcf with SMTP id m19-20020ae9e013000000b0078721f35dcfmr24038478qkk.75.1708601477323; Thu, 22 Feb 2024 03:31:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708601477; cv=none; d=google.com; s=arc-20160816; b=DSooyltiooeUQNEsBQlfkpikZEWOOmoDwW+5y+JCP81UITUNGqUkQpsWOxTEhbyMFH K8P8upeQ8XuKT/FOKhGsVSw6dkjFta2+rllsCkvQgzPwThv70r+9bHfHiMdxw5Y9x/0Q U/gj3nGVwL/tHchIH3rC5vrowe914rBzu0+OC3219rrh6lYRxbuqNyp9Z/U/Ajsdp5Bv Akn//VTyMpFxdoECvA9Dn4ErQIq1FA/89muTvybtcTQZxRW36IX39UQQ6x75ttu7c4bD OPP80BC5KATi9Bux8svaB9TBpp/i8OFfYiDui/KSEvq90qdvqzK9h05AEXqqv5VElJRb 0A3g== 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; bh=E29GLe1McW/RH14AlO0SQHZzBzL0AK0rUpiVz7qdlBM=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=idikwei38zT0f5OkaiqK0oHecnUYtxfB5SVT5CpI0M8FPnQY7txbpihOg+TFKJv3/n sb1cpCiBUDyjYhNiiu6404owr/K0RG42WChVK2pkD3VWgO0afibEhutncRhscHIFpFoc tt3ZumLazsZH/Onp0dkCt0ya3cEvxv0Z5pWcLMAgWAtXjjqn7X9rdcEgC0UMGN9R245d Q0HW3qydKMuLWnREd+SSNhkjlVl9j+JVwElnpJp/+7P4QzFJns4lxpmswWDms0KuJKgP m7boMgTGzxbxeJiDMa5h7s+IiVPi5pEGw4VtkqkQHhwNphNO7ZkGPBouhRvx+cc+/3WS bw5g==; 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 u9-20020a05620a120900b007877ec40ef5si4583878qkj.299.2024.02.22.03.31.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Feb 2024 03:31:17 -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; 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 1rd7EA-0008Fw-Ii; Thu, 22 Feb 2024 06:26:58 -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 1rd7DV-00083h-G1; Thu, 22 Feb 2024 06:26:18 -0500 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 1rd7DT-0004r4-7E; Thu, 22 Feb 2024 06:26:16 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 7FB274FB44; Thu, 22 Feb 2024 14:26:25 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 0525F87170; Thu, 22 Feb 2024 14:26:02 +0300 (MSK) Received: (nullmailer pid 2526146 invoked by uid 1000); Thu, 22 Feb 2024 11:26:01 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 02/34] hw/usb/uhci: Rename NB_PORTS -> UHCI_PORTS Date: Thu, 22 Feb 2024 14:25:29 +0300 Message-Id: <20240222112601.2526057-3-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240222112601.2526057-1-mjt@tls.msk.ru> References: <20240222112601.2526057-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, 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 From: Philippe Mathieu-Daudé Rename NB_PORTS as UHCI_PORTS to avoid definition clash with EHCI equivalent: hw/usb/hcd-uhci.h:38:9: error: 'NB_PORTS' macro redefined [-Werror,-Wmacro-redefined] #define NB_PORTS 2 ^ hw/usb/hcd-ehci.h:40:9: note: previous definition is here #define NB_PORTS 6 /* Max. Number of downstream ports */ ^ Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev --- hw/usb/hcd-uhci.c | 22 +++++++++++----------- hw/usb/hcd-uhci.h | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index b95b47f6a4..a03cf22e69 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -322,7 +322,7 @@ static void uhci_reset(DeviceState *dev) s->fl_base_addr = 0; s->sof_timing = 64; - for(i = 0; i < NB_PORTS; i++) { + for(i = 0; i < UHCI_PORTS; i++) { port = &s->ports[i]; port->ctrl = 0x0080; if (port->port.dev && port->port.dev->attached) { @@ -364,7 +364,7 @@ static const VMStateDescription vmstate_uhci = { .fields = (const VMStateField[]) { VMSTATE_PCI_DEVICE(dev, UHCIState), VMSTATE_UINT8_EQUAL(num_ports_vmstate, UHCIState, NULL), - VMSTATE_STRUCT_ARRAY(ports, UHCIState, NB_PORTS, 1, + VMSTATE_STRUCT_ARRAY(ports, UHCIState, UHCI_PORTS, 1, vmstate_uhci_port, UHCIPort), VMSTATE_UINT16(cmd, UHCIState), VMSTATE_UINT16(status, UHCIState), @@ -404,7 +404,7 @@ static void uhci_port_write(void *opaque, hwaddr addr, int i; /* send reset on the USB bus */ - for(i = 0; i < NB_PORTS; i++) { + for(i = 0; i < UHCI_PORTS; i++) { port = &s->ports[i]; usb_device_reset(port->port.dev); } @@ -457,7 +457,7 @@ static void uhci_port_write(void *opaque, hwaddr addr, int n; n = (addr >> 1) & 7; - if (n >= NB_PORTS) { + if (n >= UHCI_PORTS) { return; } port = &s->ports[n]; @@ -514,7 +514,7 @@ static uint64_t uhci_port_read(void *opaque, hwaddr addr, unsigned size) UHCIPort *port; int n; n = (addr >> 1) & 7; - if (n >= NB_PORTS) { + if (n >= UHCI_PORTS) { goto read_default; } port = &s->ports[n]; @@ -609,7 +609,7 @@ static USBDevice *uhci_find_device(UHCIState *s, uint8_t addr) USBDevice *dev; int i; - for (i = 0; i < NB_PORTS; i++) { + for (i = 0; i < UHCI_PORTS; i++) { UHCIPort *port = &s->ports[i]; if (!(port->ctrl & UHCI_PORT_EN)) { continue; @@ -1173,11 +1173,11 @@ void usb_uhci_common_realize(PCIDevice *dev, Error **errp) s->irq = pci_allocate_irq(dev); if (s->masterbus) { - USBPort *ports[NB_PORTS]; - for(i = 0; i < NB_PORTS; i++) { + USBPort *ports[UHCI_PORTS]; + for(i = 0; i < UHCI_PORTS; i++) { ports[i] = &s->ports[i].port; } - usb_register_companion(s->masterbus, ports, NB_PORTS, + usb_register_companion(s->masterbus, ports, UHCI_PORTS, s->firstport, s, &uhci_port_ops, USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL, &err); @@ -1187,14 +1187,14 @@ void usb_uhci_common_realize(PCIDevice *dev, Error **errp) } } else { usb_bus_new(&s->bus, sizeof(s->bus), &uhci_bus_ops, DEVICE(dev)); - for (i = 0; i < NB_PORTS; i++) { + for (i = 0; i < UHCI_PORTS; i++) { usb_register_port(&s->bus, &s->ports[i].port, s, i, &uhci_port_ops, USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL); } } s->bh = qemu_bh_new_guarded(uhci_bh, s, &DEVICE(dev)->mem_reentrancy_guard); s->frame_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, uhci_frame_timer, s); - s->num_ports_vmstate = NB_PORTS; + s->num_ports_vmstate = UHCI_PORTS; QTAILQ_INIT(&s->queues); memory_region_init_io(&s->io_bar, OBJECT(s), &uhci_ioport_ops, s, diff --git a/hw/usb/hcd-uhci.h b/hw/usb/hcd-uhci.h index 69f8b40c49..6d26b94e92 100644 --- a/hw/usb/hcd-uhci.h +++ b/hw/usb/hcd-uhci.h @@ -35,7 +35,7 @@ typedef struct UHCIQueue UHCIQueue; -#define NB_PORTS 2 +#define UHCI_PORTS 2 typedef struct UHCIPort { USBPort port; @@ -59,7 +59,7 @@ typedef struct UHCIState { uint32_t frame_bytes; uint32_t frame_bandwidth; bool completions_only; - UHCIPort ports[NB_PORTS]; + UHCIPort ports[UHCI_PORTS]; qemu_irq irq; /* Interrupts that should be raised at the end of the current frame. */ uint32_t pending_int_mask; From patchwork Thu Feb 22 11:25:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 774854 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp716462wrw; Thu, 22 Feb 2024 03:31:42 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXNDw3VLWZduKWWuXNJARgfCW4lNwmaiRlqzmetqgS1C788zXSdSItnfIn9o0ZYmqlf8I7OXhFqKV7aFQDBAZLb X-Google-Smtp-Source: AGHT+IHHW5wqp4UMpp6KRVnxICREvQvBLzr2j4E7ckEhXX0guy9oJdAfS76NfZ3Lygyi/tUaI8/7 X-Received: by 2002:a05:6000:18cc:b0:33d:86a5:a052 with SMTP id w12-20020a05600018cc00b0033d86a5a052mr1879266wrq.54.1708601502200; Thu, 22 Feb 2024 03:31:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708601502; cv=none; d=google.com; s=arc-20160816; b=eQMM23bGwHTF5a1CAzgXG3R4TxRdafjTn8QczILnuZyF6yG9wDgSFsvObwjNDTNWJ9 qr2y07i7bZ3IUa0QNt/IVNh75yXVU4NmYF5sKLWkzB+/wBKojGDv4u55X9BQ3mRDZSse r3RbiPEyIUJVueRbgJb4ZIOFJUCZd4skWlvZr3ox5JvJrYeGd9ykE5Rmn0a0igGfNyWL m18fbgXNpx/7SII/CoG3el192q4xytIbtt6QMoOeFp0Gc3nJTDWU3FHSRYLzIOSulpmc 4a8+Gj1ZiXhPFBMuMGK1e0UkAgq626R7YK/1xSCG2FUOHFayyUtuKnwg5lR+zQk4TUDm GNaA== 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; bh=ZszGiT/r5gA0ktQ1Md+5T3mizVgurb5e3u6hqpzxDaM=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=AdrvcRaTnXFfp3qTJgZ7TlUbT816+jD9/cWLP3sLXwgV1PCn/WSOrEHex+QrU8I9dx HxeX181EOkppuEfZChQvxKm2tGRs8knsg1JHYakS+YGXnQXeD1Yx71FHLU7sHd7VucFz cwEX/V1T8OaWVF+2lwUY+rL1RAWGz6Vgghu0HtRc6Z0Kcl84F3hNn0clVmajMbqsIaKl 3gZvJFSOKvnO8DKhucJFDjiAVO+yvMJTHqbdL+Cx134/PRIo0dduGjnVy42muIIoQ9Ir lZ00p+48spwbEGsLUB0HaGUz9I+XQMAKZjXwkmDfh8J4bbhuk84exHsGKTS/CAYXbaLG d5OQ==; 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 o11-20020adfe80b000000b0033d26b95d15si6676067wrm.756.2024.02.22.03.31.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Feb 2024 03:31:42 -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; 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 1rd7E6-0008CW-5q; Thu, 22 Feb 2024 06:26:54 -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 1rd7DW-00083k-2I; Thu, 22 Feb 2024 06:26:18 -0500 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 1rd7DT-0004rV-Ka; Thu, 22 Feb 2024 06:26:17 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 8F1D64FB45; Thu, 22 Feb 2024 14:26:25 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 14A4A87171; Thu, 22 Feb 2024 14:26:02 +0300 (MSK) Received: (nullmailer pid 2526149 invoked by uid 1000); Thu, 22 Feb 2024 11:26:01 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 03/34] hw/usb/ehci: Rename NB_PORTS -> EHCI_PORTS Date: Thu, 22 Feb 2024 14:25:30 +0300 Message-Id: <20240222112601.2526057-4-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240222112601.2526057-1-mjt@tls.msk.ru> References: <20240222112601.2526057-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, 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 From: Philippe Mathieu-Daudé Rename NB_PORTS as EHCI_PORTS to avoid definition clash with UHCI equivalent: hw/usb/hcd-ehci.h:40:9: error: 'NB_PORTS' macro redefined [-Werror,-Wmacro-redefined] #define NB_PORTS 6 /* Max. Number of downstream ports */ ^ hw/usb/hcd-uhci.h:38:9: note: previous definition is here #define NB_PORTS 2 ^ Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev --- hw/usb/hcd-ehci-pci.c | 2 +- hw/usb/hcd-ehci-sysbus.c | 2 +- hw/usb/hcd-ehci.c | 20 ++++++++++---------- hw/usb/hcd-ehci.h | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c index 0b26db74d8..3ff54edf62 100644 --- a/hw/usb/hcd-ehci-pci.c +++ b/hw/usb/hcd-ehci-pci.c @@ -83,7 +83,7 @@ static void usb_ehci_pci_init(Object *obj) s->capsbase = 0x00; s->opregbase = 0x20; s->portscbase = 0x44; - s->portnr = NB_PORTS; + s->portnr = EHCI_PORTS; if (!dc->hotpluggable) { s->companion_enable = true; diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c index bfb774504c..fe1dabd0bb 100644 --- a/hw/usb/hcd-ehci-sysbus.c +++ b/hw/usb/hcd-ehci-sysbus.c @@ -88,7 +88,7 @@ static void ehci_sysbus_class_init(ObjectClass *klass, void *data) SysBusEHCIClass *sec = SYS_BUS_EHCI_CLASS(klass); sec->portscbase = 0x44; - sec->portnr = NB_PORTS; + sec->portnr = EHCI_PORTS; dc->realize = usb_ehci_sysbus_realize; dc->vmsd = &vmstate_ehci_sysbus; diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 98a2860069..01864d4649 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -783,9 +783,9 @@ static void ehci_register_companion(USBBus *bus, USBPort *ports[], EHCIState *s = container_of(bus, EHCIState, bus); uint32_t i; - if (firstport + portcount > NB_PORTS) { + if (firstport + portcount > EHCI_PORTS) { error_setg(errp, "firstport must be between 0 and %u", - NB_PORTS - portcount); + EHCI_PORTS - portcount); return; } @@ -831,7 +831,7 @@ static USBDevice *ehci_find_device(EHCIState *ehci, uint8_t addr) USBPort *port; int i; - for (i = 0; i < NB_PORTS; i++) { + for (i = 0; i < EHCI_PORTS; i++) { port = &ehci->ports[i]; if (!(ehci->portsc[i] & PORTSC_PED)) { DPRINTF("Port %d not enabled\n", i); @@ -850,7 +850,7 @@ void ehci_reset(void *opaque) { EHCIState *s = opaque; int i; - USBDevice *devs[NB_PORTS]; + USBDevice *devs[EHCI_PORTS]; trace_usb_ehci_reset(); @@ -858,7 +858,7 @@ void ehci_reset(void *opaque) * Do the detach before touching portsc, so that it correctly gets send to * us or to our companion based on PORTSC_POWNER before the reset. */ - for(i = 0; i < NB_PORTS; i++) { + for(i = 0; i < EHCI_PORTS; i++) { devs[i] = s->ports[i].dev; if (devs[i] && devs[i]->attached) { usb_detach(&s->ports[i]); @@ -877,7 +877,7 @@ void ehci_reset(void *opaque) s->astate = EST_INACTIVE; s->pstate = EST_INACTIVE; - for(i = 0; i < NB_PORTS; i++) { + for(i = 0; i < EHCI_PORTS; i++) { if (s->companion_ports[i]) { s->portsc[i] = PORTSC_POWNER | PORTSC_PPOWER; } else { @@ -1086,7 +1086,7 @@ static void ehci_opreg_write(void *ptr, hwaddr addr, case CONFIGFLAG: val &= 0x1; if (val) { - for (i = 0; i < NB_PORTS; i++) { + for (i = 0; i < EHCI_PORTS; i++) { handle_port_owner_write(s, i, 0); } } @@ -2427,7 +2427,7 @@ static int usb_ehci_post_load(void *opaque, int version_id) EHCIState *s = opaque; int i; - for (i = 0; i < NB_PORTS; i++) { + for (i = 0; i < EHCI_PORTS; i++) { USBPort *companion = s->companion_ports[i]; if (companion == NULL) { continue; @@ -2509,9 +2509,9 @@ void usb_ehci_realize(EHCIState *s, DeviceState *dev, Error **errp) { int i; - if (s->portnr > NB_PORTS) { + if (s->portnr > EHCI_PORTS) { error_setg(errp, "Too many ports! Max. port number is %d.", - NB_PORTS); + EHCI_PORTS); return; } if (s->maxframes < 8 || s->maxframes > 512) { diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h index 2cd821f49e..56a1c09d1f 100644 --- a/hw/usb/hcd-ehci.h +++ b/hw/usb/hcd-ehci.h @@ -37,7 +37,7 @@ #define MMIO_SIZE 0x1000 #define CAPA_SIZE 0x10 -#define NB_PORTS 6 /* Max. Number of downstream ports */ +#define EHCI_PORTS 6 /* Max. Number of downstream ports */ typedef struct EHCIPacket EHCIPacket; typedef struct EHCIQueue EHCIQueue; @@ -288,7 +288,7 @@ struct EHCIState { uint32_t configflag; }; }; - uint32_t portsc[NB_PORTS]; + uint32_t portsc[EHCI_PORTS]; /* * Internal states, shadow registers, etc @@ -298,8 +298,8 @@ struct EHCIState { bool working; uint32_t astate; /* Current state in asynchronous schedule */ uint32_t pstate; /* Current state in periodic schedule */ - USBPort ports[NB_PORTS]; - USBPort *companion_ports[NB_PORTS]; + USBPort ports[EHCI_PORTS]; + USBPort *companion_ports[EHCI_PORTS]; uint32_t usbsts_pending; uint32_t usbsts_frindex; EHCIQueueHead aqueues; From patchwork Thu Feb 22 11:25:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 774857 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp716951wrw; Thu, 22 Feb 2024 03:32:55 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUGrbYa2fW+/TaSgh/ct7UcAPd0nCMEombN99XiKPa6LwFoVO+NPlFmFvl5YAKQp8gJAtDDkTtWW5dFWNPe6HHA X-Google-Smtp-Source: AGHT+IHVhQ/0By1ZTVE762OzPYlovxBQ5IPZ3D8mkfndzIDM+Wl3xrfJfSsBTZ1dhuVy+FhOhkl8 X-Received: by 2002:a05:600c:1392:b0:412:7eaf:c48f with SMTP id u18-20020a05600c139200b004127eafc48fmr1397442wmf.7.1708601575679; Thu, 22 Feb 2024 03:32:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708601575; cv=none; d=google.com; s=arc-20160816; b=ZZyI1kVM3/iwHVPvVGoNFsNSJRERVxXPpGh3OMg6BxGAWrhDJt+OKgttEyv5628qML og2Rc9SL41k4AeuvDTBzBzq4cm5tcmyAodFEaVVGn3FDebRlzy/O6PhvRFNwtcTf+Um/ /ekNPIe38SnDlZx+8FFnaoK7e/cYfLe0wT/O0ijFKvLdzHRVKOTFTK7UK4MhvpyXOrrm Y5CNcIKeu/d3s+PxQWuPHdSAvUUuSLYC4DiQ27QpNq8UaYB8sdWt/Fnf/+MpBA9TIy+s HkpnotctH6ACPH/+Yk330EyU9WQXkRmlRDamUZzgydqUOcgihisDGoj95mLSx/V+4fDc Oklw== 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; bh=oM3jE0gAwHoYh9CPWLIp1n9EAwSi8ShKrDkAfHTOFcY=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=w7wgEQ9vTwoQeAZFsHP7cTv9JLn+HkNnWykeCjW/RTlz9GNWtCV63tp1575zIGJ8PV 2jWfr1h65X2VzsMgiu7ufXkDtJ/lipUqInKo7uWCyPsCRcUN1m9EDbpxsVluDTcYp98l xMOAufTMi0MTmcmo0SWSa0mo2XabZOz8BnK85Zrht3051ir12vRbS9GkugQ5FZ4Yc6c4 6ByU/zWLyeF7DKhI3U/GapL3CNofFywo0Il+OtQpBhJWc6i1qSzoSdfOSQphhqJbhOhr LoD6kdLrJ6IKn+nn04xwpCdiAFcfZ44jPd2RK1MSpqNtNtJ/wr7kMRMjE7K5IYNVrMFU GSHQ==; 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 u5-20020a05600c138500b0040e49be48desi2090855wmf.73.2024.02.22.03.32.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Feb 2024 03:32:55 -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; 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 1rd7E0-00088D-6p; Thu, 22 Feb 2024 06:26:49 -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 1rd7De-00085l-6X; Thu, 22 Feb 2024 06:26:26 -0500 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 1rd7DW-0004se-SJ; Thu, 22 Feb 2024 06:26:24 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 9DF174FB46; Thu, 22 Feb 2024 14:26:25 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 2474587172; Thu, 22 Feb 2024 14:26:02 +0300 (MSK) Received: (nullmailer pid 2526152 invoked by uid 1000); Thu, 22 Feb 2024 11:26:01 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 04/34] hw/i386/kvm/ioapic: Replace magic '24' value by proper definition Date: Thu, 22 Feb 2024 14:25:31 +0300 Message-Id: <20240222112601.2526057-5-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240222112601.2526057-1-mjt@tls.msk.ru> References: <20240222112601.2526057-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, 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 From: Philippe Mathieu-Daudé Replace '24' -> KVM_IOAPIC_NUM_PINS. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Michael Tokarev Signed-off-by: Michael Tokarev --- hw/i386/kvm/ioapic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c index 409d0c8c76..b96fe84eed 100644 --- a/hw/i386/kvm/ioapic.c +++ b/hw/i386/kvm/ioapic.c @@ -35,7 +35,7 @@ void kvm_pc_setup_irq_routing(bool pci_enabled) kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_PIC_SLAVE, i - 8); } if (pci_enabled) { - for (i = 0; i < 24; ++i) { + for (i = 0; i < KVM_IOAPIC_NUM_PINS; ++i) { if (i == 0) { kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_IOAPIC, 2); } else if (i != 2) { From patchwork Thu Feb 22 11:25:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 774855 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp716468wrw; Thu, 22 Feb 2024 03:31:43 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU1QCLFGQ8ClHLqD/VB/uy1wuuenhWy/UQ8G0rJzwVajbC0YfRntakDTT8VvQX/zLjLWrJ33QGcFDVzEl0N8cHr X-Google-Smtp-Source: AGHT+IE6euAesaWK/dQPGYpzcbyeir/cFWULwKOL3AWu34K/05iQGvysULV2sRF+6XXjbAkYGclG X-Received: by 2002:a2e:818b:0:b0:2d2:5bf8:5842 with SMTP id e11-20020a2e818b000000b002d25bf85842mr2057049ljg.40.1708601502955; Thu, 22 Feb 2024 03:31:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708601502; cv=none; d=google.com; s=arc-20160816; b=lveN3iKPqk27MjM+6IVTocdJMbSBnfQBI2ogJkjO+50Zavoxy3RKDoRNwXud/7sL42 UIW9BWWF8auUffyAftObJuS0ewYrlLsMPUqUNoaPDcT4WHwYEtBXv6Y/SajrZT16Sn5Z 1RNz0SlCC1Ffmpx3vzouyBy9dUoXuTmCK9sik74CZudqTXXAchrjmTZlDi52n4XvDEx4 0SewTUplz1PjDGNqdFbELs2Xf4hHcsM2XTrZTauiuxCkZZ4r8XOWlCamPZshNbLubsKS PoB+KoQ9lswaSjlhEIpGs+jQU+B+5wAZfR42WAANGct/TjUuZEZwAfVjRdjae26/ObtG R6pQ== 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; bh=3suM7pEqVYy6CGExiTIeRlCqGCKg6ScUu3OQjF3rPuU=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=mS0j7JdLuEfaTRRGxCFUSHK2kDw9cCVRtUajE/5HyLI7Z3CdE6PlUkwsIeFzCqlEEL zhE3u20EJMkJihVUejSU22mTzQjr4KPA9lf6Wc6LB0w7/a4k3xl70RLRzIuO1mDNIxmA 1kA3BX5uNKTLU+iySl2eAD2Rre07+b7mvdZk5qwbi2OY+Ev+jJdHVX3ieNXrNp8mkf8n KSJHN06DxeQp8COxMpga1ZgReZWPOoGNaH9LjS4rwNac0NaKiM7pdGNdvffxnOV428Ye MpGzgcn9chdEdYHmOAhgzmGAg1S/txpFTkdvq80amn97W+yArnwq+txD69zD5/zll9lj Hemw==; 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 t12-20020a5d460c000000b0033cfa9b3a6dsi7496894wrq.434.2024.02.22.03.31.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Feb 2024 03:31:42 -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; 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 1rd7E1-00088r-LW; Thu, 22 Feb 2024 06:26:49 -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 1rd7Da-00085d-TN; Thu, 22 Feb 2024 06:26:25 -0500 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 1rd7DZ-0004sr-9V; Thu, 22 Feb 2024 06:26:22 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id ACD144FB47; Thu, 22 Feb 2024 14:26:25 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 3302B87173; Thu, 22 Feb 2024 14:26:02 +0300 (MSK) Received: (nullmailer pid 2526155 invoked by uid 1000); Thu, 22 Feb 2024 11:26:01 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 05/34] target/i386/monitor: Remove unused 'hw/i386/pc.h' header Date: Thu, 22 Feb 2024 14:25:32 +0300 Message-Id: <20240222112601.2526057-6-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240222112601.2526057-1-mjt@tls.msk.ru> References: <20240222112601.2526057-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, 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 From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Michael Tokarev Reviewed-by: Luc Michel Signed-off-by: Michael Tokarev --- target/i386/monitor.c | 1 - 1 file changed, 1 deletion(-) diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 950ff9ccbc..3a281dab02 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -33,7 +33,6 @@ #include "qapi/error.h" #include "qapi/qapi-commands-misc-target.h" #include "qapi/qapi-commands-misc.h" -#include "hw/i386/pc.h" /* Perform linear address sign extension */ static hwaddr addr_canonical(CPUArchState *env, hwaddr addr) From patchwork Thu Feb 22 11:25:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 774851 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp716087wrw; Thu, 22 Feb 2024 03:30:52 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWhZleD+qjCk6B38cS7S3csEot6HK81XNKwxI7N10ReAgA2NTu1DhhUQA+aXV359Dh93yjGPJDDC+RHvxBwdyPj X-Google-Smtp-Source: AGHT+IHfKewU4Lw+WO6dEUWKy6xRKsmRepRJCT72ZXmWWlls1KSgkNVj0qxPr3W87H1TUQtJHPKT X-Received: by 2002:a05:620a:4013:b0:787:2851:e7ec with SMTP id h19-20020a05620a401300b007872851e7ecmr28831780qko.4.1708601451846; Thu, 22 Feb 2024 03:30:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708601451; cv=none; d=google.com; s=arc-20160816; b=pLXyEeTCxiP2+sMiI1MSyn2QvijMAdgHIw0FcEqBDWTVbBSCwpYmz9UH/VN4Bkfr+n NXqyKiDUynD97tcN4G7+zKqv1l/2y4uxcQ4W1cWCrbSdJOV+XognN4rW5+xqfeV9ypzA nrIDBb1qIYuiuCMTljqy1P87G6Zr1+XxFRcoOIU6XCIwi/xpc8yyYq4vN7n1WOouzMGx WDOVNkVWzQUNyZxgPPAP1fEgpMpI64JhxQQJrDcCI5cfeLfUA3k9Y4juEPv5NIvItAoP TM6jKQwMWL9Vpf28I0NRgKNrbqaUIhVMZCYjlKQjqMNcBLBggj6iGEr7ImcC9OJ0wEpL 4QgA== 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; bh=3COKMyWQFecWz7OG7W3zLhCaEMzw/4DklyhNX9Rz4gs=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=Lw3z4GfleFQmsuaWaq9pmBbsHThWgvOTV+gqggM0Gvdf6W/VUi2mOZSv76rTLqEu4N xrVpqrkIVOEB8fSTH+FSV2NjCLK1++EHS0sKBIJjBXxmK6M8jfHwqBGnk+18NEYIzX3B Wj6LbyGroHzvTFGmw7iIGoNzzW6MWOwKnlT//oBb96zqZvlN3kF7Njicrg5SwchAHLbH 3qeh5cDRFDnW10/Wf1Ouaq76PqgyAbdy/HrWza+oOetW2y1VBkh/npe4nnoHiSSISrB8 zelssMxx1tVGBEE993v/bmEDu9uQOiXyJPBbGo40NdFGsslHVQ/emzXHXeNX4Z2FMBqu 567Q==; 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 qp17-20020a05620a389100b00787317ae356si12368705qkn.466.2024.02.22.03.30.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Feb 2024 03:30:51 -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; 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 1rd7E3-0008AH-4J; Thu, 22 Feb 2024 06:26:51 -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 1rd7Dg-00085u-94; Thu, 22 Feb 2024 06:26:28 -0500 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 1rd7Dd-0004um-HJ; Thu, 22 Feb 2024 06:26:27 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id BAC284FB48; Thu, 22 Feb 2024 14:26:25 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 4123B87174; Thu, 22 Feb 2024 14:26:02 +0300 (MSK) Received: (nullmailer pid 2526158 invoked by uid 1000); Thu, 22 Feb 2024 11:26:01 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 06/34] hw/timer: Move HPET_INTCAP definition to "hpet.h" Date: Thu, 22 Feb 2024 14:25:33 +0300 Message-Id: <20240222112601.2526057-7-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240222112601.2526057-1-mjt@tls.msk.ru> References: <20240222112601.2526057-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, 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 From: Philippe Mathieu-Daudé HPET_INTCAP is specific to TYPE_HPET, so define it there. hpet.c doesn't need to include "hw/i386/pc.h" anymore. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Michael Tokarev Reviewed-by: Luc Michel Signed-off-by: Michael Tokarev --- hw/timer/hpet.c | 1 - include/hw/i386/pc.h | 2 -- include/hw/timer/hpet.h | 2 ++ 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 1672faa4f2..01efe4885d 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -25,7 +25,6 @@ */ #include "qemu/osdep.h" -#include "hw/i386/pc.h" #include "hw/irq.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 02a0deedd3..c0e6c43fbd 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -15,8 +15,6 @@ #include "hw/firmware/smbios.h" #include "hw/cxl/cxl.h" -#define HPET_INTCAP "hpet-intcap" - /** * PCMachineState: * @acpi_dev: link to ACPI PM device that performs ACPI hotplug handling diff --git a/include/hw/timer/hpet.h b/include/hw/timer/hpet.h index f04c4d3238..d17a8d4319 100644 --- a/include/hw/timer/hpet.h +++ b/include/hw/timer/hpet.h @@ -78,6 +78,8 @@ extern struct hpet_fw_config hpet_cfg; #define TYPE_HPET "hpet" +#define HPET_INTCAP "hpet-intcap" + static inline bool hpet_find(void) { return object_resolve_path_type("", TYPE_HPET, NULL); From patchwork Thu Feb 22 11:25:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 774850 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp715942wrw; Thu, 22 Feb 2024 03:30:32 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX68SOJThcGIk5ad7eFOvYMxhDhKOA1KqGp/v1zFdPuqPqvKu0VHgziOWI70diuaq9GAFFGftq5B0Fm+3m73I+4 X-Google-Smtp-Source: AGHT+IHB52tf7GjLPy84bP9vKn3BvTVFGETwiDvV2jUr5aAbeK9LiVNWZ7z0o/TeKkilLaTz/G0F X-Received: by 2002:a05:6808:11c7:b0:3c0:33a6:bc0c with SMTP id p7-20020a05680811c700b003c033a6bc0cmr25954662oiv.23.1708601432642; Thu, 22 Feb 2024 03:30:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708601432; cv=none; d=google.com; s=arc-20160816; b=M/raMWfDbNgO+ub2f2rNv3daib3A0GhGSAuylwjRhomTpvGjXePk5UuO3m7d0d4tK7 yAGgeJyptqQEVz9HgefwbhNJ3z1FSRK5FzbRKDIZhgLBHVhAC0Y062IfAbbGAe5K+jw4 5sNTYP6L1dqo+/RWdhoaSDd7/wBum/iivRs1bA7NnLHp2J5DplVJdm6Rjz2Iz08XxJkC D0T42mH2/K4hqVk5chrnlmOxROeXNQM0/VG6GJ70xF0WKsPHmHnXS6yWdYe45rdweqKn 5qLCw+eH2O7laC07Cw80y5I9bOi9rxr3qIxEb07YGVwr2g8nPe4nUk4BRMExrixgDXrD tuRQ== 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; bh=Dp8QA9FzrtSkdi9+DV+dp+8fpLl0EnBIgSa/UIyHKfo=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=PV3f+AIWpWRt81LZL6uoiR/aCA7m6RE4kfecfti0XLwn2PI8LPKQisRm32/Y3ykSA1 OPQ7gFUVa6V5E/RdB0N6eNW84FbVOZlafrZjhWyqIstJ6UpFCqq4CzOBEJeqRis0BIB3 W3IdZs4fIlYcLkMb+luvwcJKFl7Ti8SrIjjKM7lmoqGAqcSL2Pf4pwHx69EEM7w37hij qR2k8TQJQ/xgYMNsr5Stk7dyaC7hGC6mci5+6dCgu0dxoeHdaQ7kUrymW6DbLxVwjvw/ heEYdIEOACa0bvebmqsjVAr4oPMap4/c+tJagcfDL/yHTepvta2iMLRHwCIyePLyKHdu I7NA==; 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 jo20-20020a056214501400b0068f5707a66asi10971784qvb.297.2024.02.22.03.30.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Feb 2024 03:30:32 -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; 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 1rd7E8-0008D4-Ie; Thu, 22 Feb 2024 06:26:56 -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 1rd7Dl-00086A-CI; Thu, 22 Feb 2024 06:26:34 -0500 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 1rd7Dg-0004vg-9Q; Thu, 22 Feb 2024 06:26:33 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id C90074FB49; Thu, 22 Feb 2024 14:26:25 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 4F8DF87175; Thu, 22 Feb 2024 14:26:02 +0300 (MSK) Received: (nullmailer pid 2526161 invoked by uid 1000); Thu, 22 Feb 2024 11:26:01 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 07/34] hw/isa/lpc_ich9: Remove unused 'hw/i386/pc.h' Date: Thu, 22 Feb 2024 14:25:34 +0300 Message-Id: <20240222112601.2526057-8-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240222112601.2526057-1-mjt@tls.msk.ru> References: <20240222112601.2526057-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, 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 From: Philippe Mathieu-Daudé Commit c461f3e382 ("hw/acpi/acpi_dev_interface: Remove now unused madt_cpu virtual method") removed the need for "hw/i386/pc.h". Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Michael Tokarev Reviewed-by: Luc Michel 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 70c6e8a093..bd727b2320 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -41,7 +41,6 @@ #include "hw/isa/apm.h" #include "hw/pci/pci.h" #include "hw/southbridge/ich9.h" -#include "hw/i386/pc.h" #include "hw/acpi/acpi.h" #include "hw/acpi/ich9.h" #include "hw/pci/pci_bus.h" From patchwork Thu Feb 22 11:25:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 774852 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp716094wrw; Thu, 22 Feb 2024 03:30:52 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXxwMKqY+d4tikPxSgb4N9HHZGxAk5UPhpoTAZ680msNrLeuYzMkzRUGvWHpMZNNJs59/nq5b78x2hClvpM1NSq X-Google-Smtp-Source: AGHT+IErIr7gfx2r0EuN/g/HL1NpDpkZLXSMp4k1VrKSCxb0fstkjeuc9A8GwWJ1K9t9de/+ApFq X-Received: by 2002:a05:620a:56e:b0:787:31f0:b516 with SMTP id p14-20020a05620a056e00b0078731f0b516mr21875906qkp.10.1708601452206; Thu, 22 Feb 2024 03:30:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708601452; cv=none; d=google.com; s=arc-20160816; b=Ib6JruTBM+xBkSve9TlhkpfvYAl02waphWZ2L04H16sVPEoYcSeoKGmtBJ9MfEccgj bpEePo1oHHbWDvzSSm34GLMFVfRfucGncPSO/g7eyr/4z3MNR0n1uYtCzIUpSbpW8qEx 4y84DWvvTCzlCBPRhQl890wFTUQB2CmCxQj+gcg3y868YXU/U1hwlmVTGJSZ6cJcCXUx /N0ca6rhxUHuvRLbg2DP6sIgCbSi3XjRksUk1xquniMSWmxkcV2aa+Fnx32hZi35P2bQ B0RiGbZ6LsVujafpY7O38+IHsBzXGV8tALJPO5xXR/apeq4aWb+csDup1go5pELtHphs e8cg== 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; bh=MP6vEj38dSTwOAKkjZv/ydNnV29A52FqD+K71WPESsQ=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=sofaeQs7Vt2f92B6F/JOeYcZ7LJQUAI9Z8uPp9NwLSlfYS0dUl4YYKzpuDfLGENJ1M fh6Atj3HDNx4sy/IOcKoz5JtoQ8/5uDpXbqGVbAmxKI47HtCPpX1kK2UmxfxbR7u6VVh sNPRLqNFo6cZ++4qhT19gBGrhGjGWnp3RzTQacynFO86d59UMtZPakI2rKr4hTdAFZAg n8mi1HgvH3hDT7Kg9pZv/Z9AwOCPHIAt79bdizW9cxcsXGpxpA+fjgavfahY/M/Qoe4z TgNn293AjA0WyxnMz7T2X5pM3sM/ZS/s4J32Ut/g75/wgYkBsYDdxXY2A8apJ6JeNZEr 6Wvw==; 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 x27-20020a05620a099b00b0078753d43ec8si11656036qkx.50.2024.02.22.03.30.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Feb 2024 03:30:52 -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; 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 1rd7E3-0008A3-4K; Thu, 22 Feb 2024 06:26:51 -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 1rd7Dm-00086E-Pu; Thu, 22 Feb 2024 06:26:36 -0500 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 1rd7Dk-0004x1-8N; Thu, 22 Feb 2024 06:26:33 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id D74564FB4A; Thu, 22 Feb 2024 14:26:25 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 5DEE387176; Thu, 22 Feb 2024 14:26:02 +0300 (MSK) Received: (nullmailer pid 2526164 invoked by uid 1000); Thu, 22 Feb 2024 11:26:01 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 08/34] hw/i386/acpi: Declare pc_madt_cpu_entry() in 'acpi-common.h' Date: Thu, 22 Feb 2024 14:25:35 +0300 Message-Id: <20240222112601.2526057-9-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240222112601.2526057-1-mjt@tls.msk.ru> References: <20240222112601.2526057-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, 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 From: Philippe Mathieu-Daudé Since pc_madt_cpu_entry() is only used by: - hw/i386/acpi-build.c // single call - hw/i386/acpi-common.c // definition there is no need to expose it outside of hw/i386/. Declare it in "acpi-common.h". acpi-build.c doesn't need "hw/i386/pc.h" anymore. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Michael Tokarev Reviewed-by: Luc Michel Signed-off-by: Michael Tokarev --- hw/i386/acpi-common.c | 1 - hw/i386/acpi-common.h | 3 +++ include/hw/i386/pc.h | 4 ---- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c index 43dc23f7e0..f1a11f833a 100644 --- a/hw/i386/acpi-common.c +++ b/hw/i386/acpi-common.c @@ -27,7 +27,6 @@ #include "hw/acpi/acpi.h" #include "hw/acpi/aml-build.h" #include "hw/acpi/utils.h" -#include "hw/i386/pc.h" #include "target/i386/cpu.h" #include "acpi-build.h" diff --git a/hw/i386/acpi-common.h b/hw/i386/acpi-common.h index b3c56ee014..e305aaac15 100644 --- a/hw/i386/acpi-common.h +++ b/hw/i386/acpi-common.h @@ -1,12 +1,15 @@ #ifndef HW_I386_ACPI_COMMON_H #define HW_I386_ACPI_COMMON_H +#include "hw/boards.h" #include "hw/acpi/bios-linker-loader.h" #include "hw/i386/x86.h" /* Default IOAPIC ID */ #define ACPI_BUILD_IOAPIC_ID 0x0 +void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, + GArray *entry, bool force_enabled); void acpi_build_madt(GArray *table_data, BIOSLinker *linker, X86MachineState *x86ms, const char *oem_id, const char *oem_table_id); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index c0e6c43fbd..d7c7f930ed 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -199,10 +199,6 @@ bool pc_system_ovmf_table_find(const char *entry, uint8_t **data, int *data_len); void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_t flash_size); -/* hw/i386/acpi-common.c */ -void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, - GArray *entry, bool force_enabled); - /* sgx.c */ void pc_machine_init_sgx_epc(PCMachineState *pcms); From patchwork Thu Feb 22 11:25:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 774845 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp715269wrw; Thu, 22 Feb 2024 03:28:51 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUSALKj+chlYAMtS30OpTZQmjLmvNfKwlnRCXH7EUg9Rderq593nMLUsj/194GOH8lwjo61Y0zHDi3cWYRi2PXa X-Google-Smtp-Source: AGHT+IHd4cWn96deGLTQQJggem/aLut5bkRehavvSXCz2L7Gd4MdaGhBRuKvuOtpuTUYp8VKVo5v X-Received: by 2002:a05:6214:d87:b0:68f:601b:9006 with SMTP id e7-20020a0562140d8700b0068f601b9006mr14234062qve.2.1708601331369; Thu, 22 Feb 2024 03:28:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708601331; cv=none; d=google.com; s=arc-20160816; b=NBgI9tassoYDut8VHQr9BqENakTdkoMDTF32I/CDKBMMxLRMfGcyNYSDcHkggRZi9o fxSOQN7+XLzl5xlFvvR3RtmGcNRngmSY8QfFp2XeBhmsTSyiwaKoW61CdZTejN1S2IFa 9HasqzS38p+aF1a3zqBEl9w4DcL5hb+drqGjC1E43f0OQWJupIFkGBhvPthuHhYZqv9i Q7tV2P/lCwn1MPzWQ1BIdqJTDnkUqCShfc1gjVh+6IC40r3JynvYfN3EKVAbTX+yn4bI tpd+o6u7TXf6J8cwsgv8gOfiAP3UFWKQmcv8vvMT5h/ox00Nahg+AdpsIHA4RrAmmXKo b5kA== 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; bh=56OhEX+19NTqI21IMT3/0nf3OBriSVkNn5PVKCHn3gQ=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=BOevdPXj4dKS3H+q4hOp0KWJ62JOKeGy+tDBy2TiRWY1hUulO8Y/ijAQRClp7/PmES B2GFrjKKST7WZ1jJ/5AqHKZn38qO+5OFz9JCej3uvwnQGsw90jM2+PI5mhDVeAumZuyT usEpAgYU5vsmR9/9hiDRW2jZUSwRM9lrENTttEZc29hF/VpTKVRVTYWBli3diC09nELx o03HvExyx3rEBcNs1+vqrSyFSoF5z21QKeP+JODyeBP4CTW3hSybzhPmcdS9QJsyWgIS 0lXB9rDDxr4er2dZgTxydxEa55V3HzHWXwI9QiBBrs3KXQWw89BqgzDciBowabyP25J+ KKsQ==; 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 im12-20020a056214246c00b0068f1c7e0e26si12987834qvb.47.2024.02.22.03.28.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Feb 2024 03:28:51 -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; 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 1rd7E8-0008D5-CE; Thu, 22 Feb 2024 06:26:56 -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 1rd7Do-00086N-Vh; Thu, 22 Feb 2024 06:26:37 -0500 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 1rd7Dm-00050z-Sq; Thu, 22 Feb 2024 06:26:36 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id E5EB54FB4B; Thu, 22 Feb 2024 14:26:25 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 6C5A487177; Thu, 22 Feb 2024 14:26:02 +0300 (MSK) Received: (nullmailer pid 2526167 invoked by uid 1000); Thu, 22 Feb 2024 11:26:01 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 09/34] hw/i386/port92: Add missing 'hw/isa/isa.h' header Date: Thu, 22 Feb 2024 14:25:36 +0300 Message-Id: <20240222112601.2526057-10-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240222112601.2526057-1-mjt@tls.msk.ru> References: <20240222112601.2526057-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, 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 From: Philippe Mathieu-Daudé TYPE_PORT92 inherits TYPE_ISA_DEVICE, so need to include "hw/isa/isa.h" to get its declarations (currently we indirectly include this header via "hw/i386/pc.h"). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Michael Tokarev Reviewed-by: Luc Michel Signed-off-by: Michael Tokarev --- hw/i386/port92.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/i386/port92.c b/hw/i386/port92.c index 1070bfbf36..b25157f6e4 100644 --- a/hw/i386/port92.c +++ b/hw/i386/port92.c @@ -10,6 +10,7 @@ #include "sysemu/runstate.h" #include "migration/vmstate.h" #include "hw/irq.h" +#include "hw/isa/isa.h" #include "hw/i386/pc.h" #include "trace.h" #include "qom/object.h" From patchwork Thu Feb 22 11:25:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 774849 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp715655wrw; Thu, 22 Feb 2024 03:29:56 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUDMONppTpoDsbLfJ3aUYh0uOXSR9TdbXqHllFYgZBw0ppgCjOWyF7I4o5Z/QPGq85GsEP7tYjorhmBVdKI/MAm X-Google-Smtp-Source: AGHT+IFM0ISZ3bX995CGFpvtHLm81qdHVu/L3WBX3jEOpzxtGl9nPG9QM1HQJ3gXabwG9P+wvHVY X-Received: by 2002:a0c:f38c:0:b0:68f:2e24:615a with SMTP id i12-20020a0cf38c000000b0068f2e24615amr19765813qvk.12.1708601395932; Thu, 22 Feb 2024 03:29:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708601395; cv=none; d=google.com; s=arc-20160816; b=H/4TvXOhg5a4OG0pYz/ZWezbztT0XWttmF6DW8+hK03yspjiYtJEKM4wW1E2sENhKY aP0S0dVC7OBzgDLIqzwx4zmDw8T3aTGmAusf73jc7jGQH9PRqdsOz1qbxKHU9kl/5vq2 BI9SZ8Tc0ISI2JD27fdNlVRtfufULg6Rb3gb92XJc8yZuDadGo23vPjtjaPiY96UtO3K 29g//7sEm6K1IYc0MbSurOuwiiZh+tFGc8Nvg/S20l7NPJS9yKh5jHbmaaeMGTtXDOoy vIE8r6QehZZWQrYV9O1B9uwGCergDz9ZH5hZ9YdDhGNy2hqBpWRw5ytBJ0uMEOvUDJxR h1TQ== 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; bh=JeF4GgqTcfu8dM1SUEiIllqUbLCEUeLAFsVxxY9lFuc=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=VDmQvT3ZW0zVbcMcXOmNW2vHCvHww579VSbnsC8ikB0iH/SvkeL7Ed1OBowUaJZhTN V9BO1Hn76irfiJcYAwYIRSbEQuxjE9VeEc0VHp0cY9MQBtTO8Vuyu7K5d7Ven5CgCDdA T8j4pK1LI/WN1J69hQfeySfN1/I2dCMy8ZdeevB9PlFcxEE75a78yDOpW1akp591HlbI QpfcAcP3oUxJfxZlZs6bl7j85bE8GVQFjqFiD6AOyGDDBsbgWNDDu0PD50d35zLdj4v7 zMsZXzrEH7CPVHA1MfiqpCFt4sQp9jvGRZX5mc35cTPmjByFSA4sFvAs/2TwR2UI7LMx om0Q==; 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 c1-20020a056214224100b0068f46b5f81esi12026544qvc.340.2024.02.22.03.29.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Feb 2024 03:29:55 -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; 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 1rd7E3-0008AG-6g; Thu, 22 Feb 2024 06:26:51 -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 1rd7Dq-00086W-Hi; Thu, 22 Feb 2024 06:26:38 -0500 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 1rd7Dp-00051d-1K; Thu, 22 Feb 2024 06:26:38 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 0079F4FB4C; Thu, 22 Feb 2024 14:26:26 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 7B4BB87178; Thu, 22 Feb 2024 14:26:02 +0300 (MSK) Received: (nullmailer pid 2526170 invoked by uid 1000); Thu, 22 Feb 2024 11:26:01 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 10/34] hw/acpi/cpu_hotplug: Include 'pci_device.h' instead of 'pci.h' Date: Thu, 22 Feb 2024 14:25:37 +0300 Message-Id: <20240222112601.2526057-11-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240222112601.2526057-1-mjt@tls.msk.ru> References: <20240222112601.2526057-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, 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 From: Philippe Mathieu-Daudé cpu_hotplug.c only needs the PCI *device* definitions. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Michael Tokarev Reviewed-by: Luc Michel Signed-off-by: Michael Tokarev --- hw/acpi/cpu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c index 6f78db0ccb..f7fe905e0a 100644 --- a/hw/acpi/cpu_hotplug.c +++ b/hw/acpi/cpu_hotplug.c @@ -14,7 +14,7 @@ #include "qapi/error.h" #include "hw/core/cpu.h" #include "hw/i386/pc.h" -#include "hw/pci/pci.h" +#include "hw/pci/pci_device.h" #include "qemu/error-report.h" #define CPU_EJECT_METHOD "CPEJ" From patchwork Thu Feb 22 11:25:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 774856 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp716595wrw; Thu, 22 Feb 2024 03:32:00 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWvfDMqyvFNyYs7/wLyzBD66vhQND1boZSAkANXjlRA6PfBnq+BU6GFqbjSNjNJcwoAQ3NfVTmd6UlbuiOBjYuQ X-Google-Smtp-Source: AGHT+IHHjwnZ3ZEsjtUAzzP/SKz521tGVamYN0BIxzIwx4fhgQX4xGpE31qhOpXqMOVMwEoHlXAL X-Received: by 2002:adf:f0d0:0:b0:33d:174c:1643 with SMTP id x16-20020adff0d0000000b0033d174c1643mr11901405wro.18.1708601520460; Thu, 22 Feb 2024 03:32:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708601520; cv=none; d=google.com; s=arc-20160816; b=hkxTOf1v4Y8eubQ4aAO7p/FWizp5WbzgxsqLyp1/oRfQ2gSa16iDduJwo5VfSgbpba 9lo4r6bJJFKRKys385z0XaSGslOYQNbsGXG8TR/SJ8vNBhCOwhgun+qczkOHWpVpqMuF epx3EizLwnxgKGiEqe+ynsijlLwK5952GE9GgnHmZqLCWbynSJXyrOyvvt3yQrhjUISs 62S51WYj6xuw01qQb5U4JoIwDJRmkZ3wkZxborQLY93qIAgCzay5hFAAUkdG07m91G3f M+cI89pWa44hRNtOQLOHYUl0xYVUmqc2eZziQ5ISaUHFeGcl75AQe0n7knc06CH6OfWh GaqA== 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; bh=N1KI5nCl9vig13efELrhw1Olu03dArEzdHLcP1oFKLU=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=hjZqIJT6YyGRc4BXNiCfPXik5hUL0WDnYT+V0l3Fh1yTgoX5Se+25ELq0jVB7q7A2X 92oJivCZYQzsWq9ms8ScBvHVmiTGuDT7LeswrtQFJS/0zoKAQxvITqDr2AzLU12w10JH PrwwfyI1vZm7mIUAqas2iFTk0TwXWRzQ2T0rLSZ87TwoPiMtKKsL1pz6FDzuzvUpZiM3 Tu4KQb4Ew97lChC1rf6FYHLbaAoL7OT7YAfEZRMNofifsfu6akO7RPNwpaqrs5ELgbnS zGObN6Uk2O3MdDpA5KduwmnBnzmPVrIY6RWNNZPeDS8r/EZa4HfeichO5mgVO3pL7mqc uFEg==; 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 c2-20020a5d4142000000b0033cf803e4f8si7788481wrq.23.2024.02.22.03.32.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Feb 2024 03:32:00 -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; 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 1rd7EA-0008F3-0X; Thu, 22 Feb 2024 06:26:58 -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 1rd7Du-00087h-LK; Thu, 22 Feb 2024 06:26:43 -0500 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 1rd7Dq-000527-CY; Thu, 22 Feb 2024 06:26:40 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 0EB5A4FB4D; Thu, 22 Feb 2024 14:26:26 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 89ACC87179; Thu, 22 Feb 2024 14:26:02 +0300 (MSK) Received: (nullmailer pid 2526173 invoked by uid 1000); Thu, 22 Feb 2024 11:26:01 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 11/34] hw/acpi/cpu_hotplug: Include 'x86.h' instead of 'pc.h' Date: Thu, 22 Feb 2024 14:25:38 +0300 Message-Id: <20240222112601.2526057-12-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240222112601.2526057-1-mjt@tls.msk.ru> References: <20240222112601.2526057-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, 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 From: Philippe Mathieu-Daudé X86 CPU hotplug isn't specific to PC machines. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Michael Tokarev Reviewed-by: Luc Michel Signed-off-by: Michael Tokarev --- hw/acpi/cpu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c index f7fe905e0a..83b8bc5deb 100644 --- a/hw/acpi/cpu_hotplug.c +++ b/hw/acpi/cpu_hotplug.c @@ -13,7 +13,7 @@ #include "hw/acpi/cpu_hotplug.h" #include "qapi/error.h" #include "hw/core/cpu.h" -#include "hw/i386/pc.h" +#include "hw/i386/x86.h" #include "hw/pci/pci_device.h" #include "qemu/error-report.h"