{"id":856681,"url":"http://patchwork.ozlabs.org/api/patches/856681/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20180108024558.17983-28-f4bug@amsat.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20180108024558.17983-28-f4bug@amsat.org>","list_archive_url":null,"date":"2018-01-08T02:45:56","name":"[27/29] piix3: convert reset function to QOM","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2568feadaf790d02e0eb2a68ff136c14e62d53ab","submitter":{"id":70924,"url":"http://patchwork.ozlabs.org/api/people/70924/?format=json","name":"Philippe Mathieu-Daudé","email":"f4bug@amsat.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20180108024558.17983-28-f4bug@amsat.org/mbox/","series":[{"id":21847,"url":"http://patchwork.ozlabs.org/api/series/21847/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=21847","date":"2018-01-08T02:45:30","name":"remove i386/pc dependency: generic SuperIO, PIIX cleanup","version":1,"mbox":"http://patchwork.ozlabs.org/series/21847/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/856681/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/856681/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"MwCIUs9z\"; dkim-atps=neutral"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3zFKmp4mlBz9s71\n\tfor ;\n\tMon, 8 Jan 2018 14:01:46 +1100 (AEDT)","from localhost ([::1]:59458 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1eYNh2-0002uV-NN\n\tfor incoming@patchwork.ozlabs.org; Sun, 07 Jan 2018 22:01:44 -0500","from eggs.gnu.org ([2001:4830:134:3::10]:51805)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from )\n\tid 1eYNTT-0007kl-TE\n\tfor qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:44 -0500","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from )\n\tid 1eYNTT-0003N9-4T\n\tfor qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:43 -0500","from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:35539)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1eYNTT-0003Lf-0F\n\tfor qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:43 -0500","by mail-qk0-x242.google.com with SMTP id w184so4360291qka.2\n\tfor ; Sun, 07 Jan 2018 18:47:42 -0800 (PST)","from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id\n\td10sm7156245qkg.16.2018.01.07.18.47.39\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSun, 07 Jan 2018 18:47:42 -0800 (PST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=sender:from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=ssaMPAWNZUZH4tlMuDLWk1JF9IbM8J/Wy10NLAuPKcI=;\n\tb=MwCIUs9zRaJ8Wgc7EV2qnz8Hk0oEFyedZXrnn6y81po3/tOZPYFhHcvtGjQHmzVF5l\n\t5pPr/9OqpTaQhAARSndMdiUeRDp6BtzDWql+8Q/Z7omywIMnTJkK0kvtFusnQKgGhm1J\n\tSAI3l282gvCKJ7GbAe4sAsa7w3JSl2bxZZilgNF/j5r5HXnpsavd4OOJ/ew8wNRgcDD5\n\tgUAg0HH/g/eIYRcqp4HkyPW/0C8cmUeHUOm9j1NMxMfJl3FfDmzWPLQn9skYM8C5Bk6u\n\tm0NwLHthe9wpBpPPIFnD+vM6DNdTez8Lys9YXGyXNuEglUlQrlWsqNgkfLiyGInwarym\n\t3mDg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:sender:from:to:cc:subject:date:message-id\n\t:in-reply-to:references:mime-version:content-transfer-encoding;\n\tbh=ssaMPAWNZUZH4tlMuDLWk1JF9IbM8J/Wy10NLAuPKcI=;\n\tb=oaP2+4Hwx8UjkAIA2pNKj1PH+BZEIYLTu59+CVAq8iaDXwCu+cH94We4cDziDu+h38\n\tNl83XHRhZqZ3bLNz9gfBXMYEQLQesZaa7/9TjU7Sb5Z7lGh2VaRpiLNy5PCQsrUTE81w\n\tToGMa9Iudhv75fc82I/xZNGq6Z8oXsobgUtv40+Dk7vb2w9ApAgk68DOuPIOuYY0FgXR\n\tYbfpEJxZMCecaq5eMeMcMS2/5XeGUOYRTt+X0fSTabnypYG7L+84W9A6l1Kds6EpLu5q\n\thgE3eUaANilO5SridAWj2HwHf+rU0WdDRE8lYvYC9uGah4kbDJj0eux139/Dd3VBarXM\n\ty85w==","X-Gm-Message-State":"AKGB3mLA6RfmJ3KoUAu/k5frzoR0uy0rmSCfePghfun+vgsSg7e/Q29V\n\tsGsw1z7CmOlGHguNpSH94BI=","X-Google-Smtp-Source":"ACJfBos8ycOhHUpMy+rebSoZ2PPYm0vSalT/poeElePpCx4X9fvGrn0GFkF+hVuofHlOUWKMJq07SQ==","X-Received":"by 10.55.195.69 with SMTP id a66mr13423851qkj.83.1515379662476; \n\tSun, 07 Jan 2018 18:47:42 -0800 (PST)","From":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ","To":"Paolo Bonzini ,\n\t\"Michael S. Tsirkin\" , =?utf-8?q?Herv=C3=A9_Poussinea?=\n\t=?utf-8?q?u?= ,\n\tAurelien Jarno , Eduardo Habkost\n\t, Marcel Apfelbaum ","Date":"Sun, 7 Jan 2018 23:45:56 -0300","Message-Id":"<20180108024558.17983-28-f4bug@amsat.org>","X-Mailer":"git-send-email 2.15.1","In-Reply-To":"<20180108024558.17983-1-f4bug@amsat.org>","References":"<20180108024558.17983-1-f4bug@amsat.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2607:f8b0:400d:c09::242","Subject":"[Qemu-devel] [PATCH 27/29] piix3: convert reset function to QOM","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Igor Mammedov , =?utf-8?q?Philippe_Mathieu-Daud?=\n\t=?utf-8?b?w6k=?= , \tqemu-devel@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Philippe Mathieu-Daudé \n---\n hw/southbridge/piix.c | 13 ++++++-------\n 1 file changed, 6 insertions(+), 7 deletions(-)","diff":"diff --git a/hw/southbridge/piix.c b/hw/southbridge/piix.c\nindex df08d94a59..2d429d6b29 100644\n--- a/hw/southbridge/piix.c\n+++ b/hw/southbridge/piix.c\n@@ -203,10 +203,10 @@ static void piix3_write_config_xen(PCIDevice *dev,\n piix3_write_config(dev, address, val, len);\n }\n \n-static void piix3_reset(void *opaque)\n+static void piix3_reset(DeviceState *dev)\n {\n- PIIX3State *d = opaque;\n- uint8_t *pci_conf = d->dev.config;\n+ PIIX3State *s = PIIX3_PCI_DEVICE(dev);\n+ uint8_t *pci_conf = s->dev.config;\n \n pci_conf[0x04] = 0x07; /* master, memory and I/O */\n pci_conf[0x05] = 0x00;\n@@ -240,8 +240,8 @@ static void piix3_reset(void *opaque)\n pci_conf[0xac] = 0x00;\n pci_conf[0xae] = 0x00;\n \n- d->pic_levels = 0;\n- d->rcr = 0;\n+ s->pic_levels = 0;\n+ s->rcr = 0;\n }\n \n static int piix3_post_load(void *opaque, int version_id)\n@@ -352,8 +352,6 @@ static void piix3_realize(PCIDevice *dev, Error **errp)\n \"piix3-reset-control\", 1);\n memory_region_add_subregion_overlap(pci_address_space_io(dev), RCR_IOPORT,\n &d->rcr_mem, 1);\n-\n- qemu_register_reset(piix3_reset, d);\n }\n \n static void pci_piix3_class_init(ObjectClass *klass, void *data)\n@@ -364,6 +362,7 @@ static void pci_piix3_class_init(ObjectClass *klass, void *data)\n dc->desc = \"ISA bridge\";\n dc->vmsd = &vmstate_piix3;\n dc->hotpluggable = false;\n+ dc->reset = piix3_reset;\n k->realize = piix3_realize;\n k->vendor_id = PCI_VENDOR_ID_INTEL;\n /* 82371SB PIIX3 PCI-to-ISA bridge (Step A1) */\n","prefixes":["27/29"]}