Received: by 2002:a17:907:c68a:b0:84d:2074:29bb with SMTP id ue10csp2447535ejc; Mon, 9 Jan 2023 09:26:07 -0800 (PST) X-Google-Smtp-Source: AMrXdXtKcNdi15BP5/kzPLFohqyULK8+AegxPuLyZ3AbcZLsUL+M8LV7kzTHUO3CRaRkd0NvwGIt X-Received: by 2002:a05:690c:d89:b0:4bb:50e5:d84c with SMTP id da9-20020a05690c0d8900b004bb50e5d84cmr25491857ywb.18.1673285167455; Mon, 09 Jan 2023 09:26:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673285167; cv=none; d=google.com; s=arc-20160816; b=AzP1HyzXjI0Rb0UZefYgXVhlvscef/28M1JmXw9hGeiNCFE2NvGIPCuF9HHVvOqonK n6464uIwF2uNfC8+XZDU9vTbK6Ql1ZijbEXDi+0DTQbYbv7+uHNaTKoRPKnxAOmLobrU 9qWXYnc65FfYp4kfrCTrHZdmO8x53Hkt5PPPAnb8LkR0wrOzKKMTlPFPj/PUD0+L0x4V e9X120Z/jZZnBwp5VDBb4HszTk3xXZ+rno8VXLKFtWI4COjGQD+HZdkojAzbOAMtwwqu EoH99YN++h0Mrkj+xAB0gNc8/x+naZm9cDZ1bjEytia791rl+AOlSMiedCHfbOZl+xUE YDEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WIDo2jI0cjvg3OZzCNi4WjWwXGeVB0wW7q2m5W06ZwQ=; b=Y8a+JAv0JRd5jufIgMP/pdtx09oUAsbR1sJvEXn0PHAjYCJhIARUNL8yWkqkvfUbD3 mKJJDWp04Y3IxhLT/QsP+jrna+OtVln4fveZGovEuOAIQSYN5oss44m6diQyrDvUpcug 1jssTGIlU7lalVfkCVeI5+4M3YonjU4q9HDVkXHNxYuJ4cC1j9eNHkXDwauOX7Z6wD+X AWgAzkiNBZetMajH1IgcCcjpASj0KcpODhR9wAR9wwc1EiTkKSS03+ssrvv4sCXSeuwt bH2/RDsfHJ4fmAhFgtjnGirDlrTf1nL9mO32bBf9s0jimL4vaRmpXFVJRNUybN8v7qz2 dwmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=GcNdJyCJ; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c25-20020a05620a269900b006f9720b5fcbsi5069107qkp.79.2023.01.09.09.26.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Jan 2023 09:26:07 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=GcNdJyCJ; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEvuJ-0003Qb-OT; Mon, 09 Jan 2023 12:25:59 -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 1pEvtn-0002mj-5S; Mon, 09 Jan 2023 12:25:27 -0500 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEvtk-000131-TK; Mon, 09 Jan 2023 12:25:26 -0500 Received: by mail-ej1-x635.google.com with SMTP id u19so21853263ejm.8; Mon, 09 Jan 2023 09:25:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WIDo2jI0cjvg3OZzCNi4WjWwXGeVB0wW7q2m5W06ZwQ=; b=GcNdJyCJJ1ZkoyjBIk2o+IvDbpfeK/iQoTSarUopgKyHJ9E7m0AYNACnF32yaaGVzB TeG0tIAWtl08FfwbxpnL5RvVMBEzKCYGgzo38w/yyCfS2RKW3lrfTZa1WzB8OlAIgtP2 WsjBwssDL5HFJwtjU7HFvzSiVdRDB9eoocSuMUCP5f9jBaO3dSaz6qzi52VU7nPzxQ8R aYUikBaN8c2sYKVZc7XRuQJk7Ss1aA2jFU2wBnGbIOvemzDNBnwkjUEF+snh+DJ+zucH yJFnI67wRUY07li5bdsXF+rGMb6seQ8yVBcpq2g0Ee//megdvWc3loSCpC5XS5/ZXzUO 9phg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WIDo2jI0cjvg3OZzCNi4WjWwXGeVB0wW7q2m5W06ZwQ=; b=tNJdwFr0CJqHDOA3zqoY4gcxCRDNXFZHqL6HkiL6j6uqGAhW24ZQ6Vz5PYyPRY5hni VBCVv2NzyjIHRnkr+/lpT2wun7bR3u8uY+MiLiUzSrv6URWevvAYHjiB+LXMEe/iUyka VrOUdYo0NwjuSu/PEFvds7kkWDQCcaw2BqBMxJtSbpd7j17d7DqQQ9bNVEaKgMoEdWen 3wAgFDiSEeqsnZ+xgK/eN8KQ8jo+4bohQlEoq51dCkoHSOsFPEsvWmw0wsHYZwhAowRj xy6HidziFXpnVKHYiXQiC0GWbYMDxebAUQb3IptQJqXTQgoWTmE0RA7AFhnPxzQTLVMd 98Xw== X-Gm-Message-State: AFqh2kp2QBLz340moNwuVz6m87y6CJuUfCe9G1gfAFjzXK/VTRlHebye yJhV0/5sM12zuno4ycFOh5mcwZd/9GMz/A== X-Received: by 2002:a17:906:3c0d:b0:84d:34f0:f766 with SMTP id h13-20020a1709063c0d00b0084d34f0f766mr9005812ejg.75.1673285122706; Mon, 09 Jan 2023 09:25:22 -0800 (PST) Received: from osoxes.fritz.box (p200300faaf0bb2009c4947838afc41b6.dip0.t-ipconnect.de. [2003:fa:af0b:b200:9c49:4783:8afc:41b6]) by smtp.gmail.com with ESMTPSA id 18-20020a170906201200b00846734faa9asm3925625ejo.164.2023.01.09.09.25.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 09:25:22 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: John G Johnson , Richard Henderson , Igor Mammedov , Elena Ufimtseva , Ani Sinha , Eduardo Habkost , Gerd Hoffmann , Jagannathan Raman , "Michael S. Tsirkin" , Paolo Bonzini , John Snow , Aurelien Jarno , qemu-ppc@nongnu.org, Jiaxun Yang , qemu-block@nongnu.org, Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , qemu-arm@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Bernhard Beschow Subject: [PATCH v6 26/33] hw/isa/piix4: Reuse struct PIIXState from PIIX3 Date: Mon, 9 Jan 2023 18:23:39 +0100 Message-Id: <20230109172347.1830-27-shentey@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230109172347.1830-1-shentey@gmail.com> References: <20230109172347.1830-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=shentey@gmail.com; helo=mail-ej1-x635.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: e0KyJnALjDvS Now that PIIX4 also uses TYPE_ISA_PIC, both implementations can share the same struct. Signed-off-by: Bernhard Beschow Reviewed-by: Michael S. Tsirkin Message-Id: <20221022150508.26830-34-shentey@gmail.com> --- hw/isa/piix4.c | 51 +++++++++++++++----------------------------------- 1 file changed, 15 insertions(+), 36 deletions(-) diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index eae4db0182..ce88377630 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -42,32 +42,10 @@ #include "sysemu/runstate.h" #include "qom/object.h" -struct PIIX4State { - PCIDevice dev; - - ISAPICState pic; - RTCState rtc; - PCIIDEState ide; - UHCIState uhci; - PIIX4PMState pm; - - uint32_t smb_io_base; - - /* Reset Control Register */ - MemoryRegion rcr_mem; - uint8_t rcr; - - bool has_acpi; - bool has_usb; - bool smm_enabled; -}; - -OBJECT_DECLARE_SIMPLE_TYPE(PIIX4State, PIIX4_PCI_DEVICE) - static void piix4_set_irq(void *opaque, int irq_num, int level) { int i, pic_irq, pic_level; - PIIX4State *s = opaque; + PIIXState *s = opaque; PCIBus *bus = pci_get_bus(&s->dev); /* now we change the pic irq level according to the piix irq mappings */ @@ -87,7 +65,7 @@ static void piix4_set_irq(void *opaque, int irq_num, int level) static void piix4_isa_reset(DeviceState *dev) { - PIIX4State *d = PIIX4_PCI_DEVICE(dev); + PIIXState *d = PIIX_PCI_DEVICE(dev); uint8_t *pci_conf = d->dev.config; pci_conf[0x04] = 0x07; // master, memory and I/O @@ -122,12 +100,13 @@ static void piix4_isa_reset(DeviceState *dev) pci_conf[0xac] = 0x00; pci_conf[0xae] = 0x00; + d->pic_levels = 0; /* not used in PIIX4 */ d->rcr = 0; } static int piix4_post_load(void *opaque, int version_id) { - PIIX4State *s = opaque; + PIIXState *s = opaque; if (version_id == 2) { s->rcr = 0; @@ -142,8 +121,8 @@ static const VMStateDescription vmstate_piix4 = { .minimum_version_id = 2, .post_load = piix4_post_load, .fields = (VMStateField[]) { - VMSTATE_PCI_DEVICE(dev, PIIX4State), - VMSTATE_UINT8_V(rcr, PIIX4State, 3), + VMSTATE_PCI_DEVICE(dev, PIIXState), + VMSTATE_UINT8_V(rcr, PIIXState, 3), VMSTATE_END_OF_LIST() } }; @@ -151,7 +130,7 @@ static const VMStateDescription vmstate_piix4 = { static void piix4_rcr_write(void *opaque, hwaddr addr, uint64_t val, unsigned int len) { - PIIX4State *s = opaque; + PIIXState *s = opaque; if (val & 4) { qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); @@ -163,7 +142,7 @@ static void piix4_rcr_write(void *opaque, hwaddr addr, uint64_t val, static uint64_t piix4_rcr_read(void *opaque, hwaddr addr, unsigned int len) { - PIIX4State *s = opaque; + PIIXState *s = opaque; return s->rcr; } @@ -180,7 +159,7 @@ static const MemoryRegionOps piix4_rcr_ops = { static void piix4_realize(PCIDevice *dev, Error **errp) { - PIIX4State *s = PIIX4_PCI_DEVICE(dev); + PIIXState *s = PIIX_PCI_DEVICE(dev); PCIBus *pci_bus = pci_get_bus(dev); ISABus *isa_bus; @@ -250,7 +229,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp) static void piix4_init(Object *obj) { - PIIX4State *s = PIIX4_PCI_DEVICE(obj); + PIIXState *s = PIIX_PCI_DEVICE(obj); object_initialize_child(obj, "pic", &s->pic, TYPE_ISA_PIC); object_initialize_child(obj, "rtc", &s->rtc, TYPE_MC146818_RTC); @@ -258,10 +237,10 @@ static void piix4_init(Object *obj) } static Property piix4_props[] = { - DEFINE_PROP_UINT32("smb_io_base", PIIX4State, smb_io_base, 0), - DEFINE_PROP_BOOL("has-acpi", PIIX4State, has_acpi, true), - DEFINE_PROP_BOOL("has-usb", PIIX4State, has_usb, true), - DEFINE_PROP_BOOL("smm-enabled", PIIX4State, smm_enabled, false), + DEFINE_PROP_UINT32("smb_io_base", PIIXState, smb_io_base, 0), + DEFINE_PROP_BOOL("has-acpi", PIIXState, has_acpi, true), + DEFINE_PROP_BOOL("has-usb", PIIXState, has_usb, true), + DEFINE_PROP_BOOL("smm-enabled", PIIXState, smm_enabled, false), DEFINE_PROP_END_OF_LIST(), }; @@ -289,7 +268,7 @@ static void piix4_class_init(ObjectClass *klass, void *data) static const TypeInfo piix4_info = { .name = TYPE_PIIX4_PCI_DEVICE, .parent = TYPE_PCI_DEVICE, - .instance_size = sizeof(PIIX4State), + .instance_size = sizeof(PIIXState), .instance_init = piix4_init, .class_init = piix4_class_init, .interfaces = (InterfaceInfo[]) { -- 2.39.0