From nobody Thu Nov 13 23:40:46 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1583594208; cv=none; d=zohomail.com; s=zohoarc; b=J/1F+Hcr5ZKRvnbhnIqOjGl9T/R+W8GRazjlZRjV/il8oVErEycpF11A0mWM3Pk2DWY0jXq24ttqcIwUy1xi6gZ9lB6kVhqLotFKo7eTa39q1e2sUM2PLWD9+cREHiDLb9d/wwt3cuusFDv58F+07cXGMPALl6P8NXq4eguHmyU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583594208; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=a2vZ8ko3UMrExm/WdL+CM/ltAUWrYVbHn/NT9gbPlWU=; b=RPu+NW6a2ysxENRt3fUwBaeSh239OW+RreKEt/FAi0sZz8TF0U0ptDi/2SZt2PPoKEgDct712kJ6LWCYaHBNQkeTxVwYgxzuIxwS1dQSkneIAaGs6Liv0YbXN1PGTxVwgcRDx7eto2gtlna5gGjGw3GqmKNRYLFh78QlKr/St1o= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583594208355420.4349054308434; Sat, 7 Mar 2020 07:16:48 -0800 (PST) Received: from localhost ([::1]:49730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAbC3-0003O7-Ds for importer@patchew.org; Sat, 07 Mar 2020 10:16:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59756) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAbB8-0001mk-U3 for qemu-devel@nongnu.org; Sat, 07 Mar 2020 10:15:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAbB7-000325-TD for qemu-devel@nongnu.org; Sat, 07 Mar 2020 10:15:50 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:38342 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jAbB7-000303-ME; Sat, 07 Mar 2020 10:15:49 -0500 Received: from host86-162-6-80.range86-162.btcentralplus.com ([86.162.6.80] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1jAbBQ-0007LU-JK; Sat, 07 Mar 2020 15:16:12 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, qemu-block@nongnu.org, jsnow@redhat.com Date: Sat, 7 Mar 2020 15:15:35 +0000 Message-Id: <20200307151536.32709-2-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200307151536.32709-1-mark.cave-ayland@ilande.co.uk> References: <20200307151536.32709-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.162.6.80 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 1/2] cmd646: register cmd646_reset() function in DeviceClass X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:41c9:1:41f::167 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/ide/cmd646.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 335c060673..2f11d8de24 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -207,9 +207,9 @@ static void cmd646_set_irq(void *opaque, int channel, i= nt level) cmd646_update_irq(pd); } =20 -static void cmd646_reset(void *opaque) +static void cmd646_reset(DeviceState *dev) { - PCIIDEState *d =3D opaque; + PCIIDEState *d =3D PCI_IDE(dev); unsigned int i; =20 for (i =3D 0; i < 2; i++) { @@ -303,7 +303,6 @@ static void pci_cmd646_ide_realize(PCIDevice *dev, Erro= r **errp) g_free(irq); =20 vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_pci, d); - qemu_register_reset(cmd646_reset, d); } =20 static void pci_cmd646_ide_exitfn(PCIDevice *dev) @@ -339,6 +338,7 @@ static void cmd646_ide_class_init(ObjectClass *klass, v= oid *data) DeviceClass *dc =3D DEVICE_CLASS(klass); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); =20 + dc->reset =3D cmd646_reset; k->realize =3D pci_cmd646_ide_realize; k->exit =3D pci_cmd646_ide_exitfn; k->vendor_id =3D PCI_VENDOR_ID_CMD; --=20 2.20.1 From nobody Thu Nov 13 23:40:46 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1583594210; cv=none; d=zohomail.com; s=zohoarc; b=mysErh6BrXopKH+VbeeqP5bTDFjpslN8uiTqC29jbHml8om2TornQOLuY7Tfj8gQaT1d4RvFFfKkrx+MSQHOCjM6jhFJUGXGeY3Y8UMHz4CFMxUs4jvAp0AhGEuu39da+vqgny0CEYJ4WxiJCej7WO6fcUAe4CelQqVFTUwPyns= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583594210; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZRTypKab+nMImI+I1X00QQLqE93QtxztQajwVP9W2K0=; b=YN31BUIQe1qsqbFH75BeAVDN0cMX4fmPYqLtMH7Wxul79XdlRzKzbyQ22xkksjK9Ko6xy8EXOLeFIDQgRXM57qp22VqKNPv+adRbYjL45ofYUYHvqJCTCTDVOr/QPv86zrTGzFR+lE5AJ0Ow6makhCua1M03+s/IelVyg2LBpvU= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583594210913575.8495893429395; Sat, 7 Mar 2020 07:16:50 -0800 (PST) Received: from localhost ([::1]:49732 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAbC6-0003Tn-0U for importer@patchew.org; Sat, 07 Mar 2020 10:16:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59798) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAbBC-0001rB-Bd for qemu-devel@nongnu.org; Sat, 07 Mar 2020 10:15:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAbBB-0003BI-DS for qemu-devel@nongnu.org; Sat, 07 Mar 2020 10:15:54 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:38348 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jAbBB-00039M-1z; Sat, 07 Mar 2020 10:15:53 -0500 Received: from host86-162-6-80.range86-162.btcentralplus.com ([86.162.6.80] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1jAbBV-0007LU-0Y; Sat, 07 Mar 2020 15:16:16 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, qemu-block@nongnu.org, jsnow@redhat.com Date: Sat, 7 Mar 2020 15:15:36 +0000 Message-Id: <20200307151536.32709-3-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200307151536.32709-1-mark.cave-ayland@ilande.co.uk> References: <20200307151536.32709-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.162.6.80 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 2/2] cmd646: register vmstate_ide_pci VMStateDescription in DeviceClass X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:41c9:1:41f::167 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/ide/cmd646.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 2f11d8de24..3c4f765bd6 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -301,8 +301,6 @@ static void pci_cmd646_ide_realize(PCIDevice *dev, Erro= r **errp) ide_register_restart_cb(&d->bus[i]); } g_free(irq); - - vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_pci, d); } =20 static void pci_cmd646_ide_exitfn(PCIDevice *dev) @@ -339,6 +337,7 @@ static void cmd646_ide_class_init(ObjectClass *klass, v= oid *data) PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); =20 dc->reset =3D cmd646_reset; + dc->vmsd =3D &vmstate_ide_pci; k->realize =3D pci_cmd646_ide_realize; k->exit =3D pci_cmd646_ide_exitfn; k->vendor_id =3D PCI_VENDOR_ID_CMD; --=20 2.20.1