Message ID | 20180108024558.17983-13-f4bug@amsat.org |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qCvHRpdf"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zFKry4ZHfz9s71 for <incoming@patchwork.ozlabs.org>; Mon, 8 Jan 2018 14:05:22 +1100 (AEDT) Received: from localhost ([::1]:59575 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1eYNkW-0005jv-Ld for incoming@patchwork.ozlabs.org; Sun, 07 Jan 2018 22:05:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51421) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <philippe.mathieu.daude@gmail.com>) id 1eYNSd-0006yC-Al for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:46:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <philippe.mathieu.daude@gmail.com>) id 1eYNSc-0002XM-Jr for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:46:51 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:40334) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <philippe.mathieu.daude@gmail.com>) id 1eYNSc-0002XF-FQ for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:46:50 -0500 Received: by mail-qk0-x243.google.com with SMTP id d18so2145448qke.7 for <qemu-devel@nongnu.org>; Sun, 07 Jan 2018 18:46:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uydIT8gqvnn8TqxGE/MpxbAQQJWpZ4BDA+4Odyh42bY=; b=qCvHRpdf5D7NnT/pqU6+E3J0TZFAvBb6jYGn7lj/batiMuXQtoog9wj9h04hSL130o d9l/m1hMKhPN1yoOmeZxo993D39icVF+punM63KpGiWVJQIZQ1E702kZd7bAtiZ2DUzw 6DqpagouMv/Q8fGN5329LkxxYpeqr13wyLwlsbQdwrpebxErHe5qSLSJxHxk/fd2XFiT 3U/TrqH2CC+g0uhRCPGEAIXLJIEXZRUzhZPB/BCuwsH0HMYlzC3Pmyov5zwmEBnI5ZWR 1WKUSqv0IiaU1wjH98FTgTXNzyBU92mLhrrrzPRcZ+xVrGG7SgG0bdL7IUFLQ2hlRxMt UVHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=uydIT8gqvnn8TqxGE/MpxbAQQJWpZ4BDA+4Odyh42bY=; b=QATMSkzzPy8kFZ7Zt0JqMoGK5clfMyA1wm0gp4j1PAx2buX0LNgqlVEShDjr8/cNkL UDWkVOK/x6TgyCdih0koqbtN3mLjznRyPAMZvCgHM+yhL4qoxar03us7UkaZgqloPikL AnC85yfbxdIPQ592CWo9euHd+19uFSZTq2JOvEs1MWfEzBe/C4YiJT0QMcvoVAxNafF8 Y4wy5BSImkTIrgbzATpJ+Av2tiHRjK3jlb0fXv4uFlw8vz0VSqlWIhZ8kyChnhAg4arO 00Y7ZcNhrskbMsWJxvbdZRfPMTowcV023xrNMgrsq3yeE92G9+iJJMfVZ8JwJf1vq8DL Sxyw== X-Gm-Message-State: AKwxytf8Pki9RC6e9V9D1a4dM20HQiXJ5hkML+v3Qkxn2WsmdWRTjBFA OblPsRYPrmZgXKGxcTNys9I= X-Google-Smtp-Source: ACJfBots0iNi6gQUTe0a867steJvFMi/xJAKAPFGYBgPjBUu3hejVqFu5zy9stEOpDOdioZPhDbXww== X-Received: by 10.55.136.135 with SMTP id k129mr14657654qkd.3.1515379609996; Sun, 07 Jan 2018 18:46:49 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d10sm7156245qkg.16.2018.01.07.18.46.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Jan 2018 18:46:49 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org> To: Paolo Bonzini <pbonzini@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, =?utf-8?q?Herv=C3=A9_Poussinea?= =?utf-8?q?u?= <hpoussin@reactos.org>, Aurelien Jarno <aurelien@aurel32.net>, Eduardo Habkost <ehabkost@redhat.com>, Marcel Apfelbaum <marcel@redhat.com> Date: Sun, 7 Jan 2018 23:45:41 -0300 Message-Id: <20180108024558.17983-13-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 recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH 12/29] piix4: rename some variables in realize function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Igor Mammedov <imammedo@redhat.com>, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
remove i386/pc dependency: generic SuperIO, PIIX cleanup
|
expand
|
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 6b8bc3faf0..7b231b704b 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -87,16 +87,17 @@ static const VMStateDescription vmstate_piix4 = { } }; -static void piix4_realize(PCIDevice *dev, Error **errp) +static void piix4_realize(PCIDevice *pci_dev, Error **errp) { - PIIX4State *d = PIIX4_PCI_DEVICE(dev); + DeviceState *dev = DEVICE(pci_dev); + PIIX4State *s = DO_UPCAST(PIIX4State, dev, pci_dev); - if (!isa_bus_new(DEVICE(d), pci_address_space(dev), - pci_address_space_io(dev), errp)) { + if (!isa_bus_new(dev, pci_address_space(pci_dev), + pci_address_space_io(pci_dev), errp)) { return; } - piix4_dev = &d->dev; - qemu_register_reset(piix4_reset, d); + piix4_dev = pci_dev; + qemu_register_reset(piix4_reset, s); } int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn)