From patchwork Wed Jan 5 19:44:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 77628 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 80F38B70E0 for ; Thu, 6 Jan 2011 06:46:53 +1100 (EST) Received: from localhost ([127.0.0.1]:59337 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PaZJq-0002Ny-IP for incoming@patchwork.ozlabs.org; Wed, 05 Jan 2011 14:46:50 -0500 Received: from [140.186.70.92] (port=39529 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PaZHZ-0001uq-El for qemu-devel@nongnu.org; Wed, 05 Jan 2011 14:44:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PaZHU-0006eV-J0 for qemu-devel@nongnu.org; Wed, 05 Jan 2011 14:44:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:62568) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PaZHU-0006eR-8u for qemu-devel@nongnu.org; Wed, 05 Jan 2011 14:44:24 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p05JiNtw000314 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 5 Jan 2011 14:44:23 -0500 Received: from redhat.com (vpn-9-85.rdu.redhat.com [10.11.9.85]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id p05JiLJa021736; Wed, 5 Jan 2011 14:44:21 -0500 Date: Wed, 5 Jan 2011 21:44:06 +0200 From: "Michael S. Tsirkin" To: Gerd Hoffmann Message-ID: <20110105194406.GC28688@redhat.com> References: <1291123564-3249-1-git-send-email-kraxel@redhat.com> <1291123564-3249-3-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1291123564-3249-3-git-send-email-kraxel@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] Re: [PATCH 2/3] piix: tag as not hotpluggable. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On Tue, Nov 30, 2010 at 02:26:03PM +0100, Gerd Hoffmann wrote: > This patch tags all pci devices which belong to the piix3/4 chipsets as > not hotpluggable (Host bridge, ISA bridge, IDE controller, ACPI bridge). > > Signed-off-by: Gerd Hoffmann > --- > hw/acpi_piix4.c | 2 ++ > hw/ide/piix.c | 2 ++ > hw/piix4.c | 1 + > hw/piix_pci.c | 2 ++ > 4 files changed, 7 insertions(+), 0 deletions(-) > > diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c > index 173d781..273097d 100644 > --- a/hw/acpi_piix4.c > +++ b/hw/acpi_piix4.c > @@ -428,6 +428,8 @@ static PCIDeviceInfo piix4_pm_info = { > .qdev.desc = "PM", > .qdev.size = sizeof(PIIX4PMState), > .qdev.vmsd = &vmstate_acpi, > + .qdev.no_user = 1, > + .no_hotplug = 1, > .init = piix4_pm_initfn, > .config_write = pm_write_config, > .qdev.props = (Property[]) { > diff --git a/hw/ide/piix.c b/hw/ide/piix.c > index 07483e8..173ba4b 100644 > --- a/hw/ide/piix.c > +++ b/hw/ide/piix.c > @@ -184,11 +184,13 @@ static PCIDeviceInfo piix_ide_info[] = { > .qdev.name = "piix3-ide", > .qdev.size = sizeof(PCIIDEState), > .qdev.no_user = 1, > + .no_hotplug = 1, > .init = pci_piix3_ide_initfn, > },{ > .qdev.name = "piix4-ide", > .qdev.size = sizeof(PCIIDEState), > .qdev.no_user = 1, > + .no_hotplug = 1, > .init = pci_piix4_ide_initfn, > },{ > /* end of list */ > diff --git a/hw/piix4.c b/hw/piix4.c > index 5489386..1678898 100644 > --- a/hw/piix4.c > +++ b/hw/piix4.c > @@ -113,6 +113,7 @@ static PCIDeviceInfo piix4_info[] = { > .qdev.desc = "ISA bridge", > .qdev.size = sizeof(PCIDevice), > .qdev.no_user = 1, > + .qdev.no_hotplug = 1, > .init = piix4_initfn, > },{ > /* end of list */ This one breaks the build for me. The below seems to help - but begs the question: was this tested? Thanks, diff --git a/hw/piix4.c b/hw/piix4.c index 1678898..00da049 100644 --- a/hw/piix4.c +++ b/hw/piix4.c @@ -113,7 +113,7 @@ static PCIDeviceInfo piix4_info[] = { .qdev.desc = "ISA bridge", .qdev.size = sizeof(PCIDevice), .qdev.no_user = 1, - .qdev.no_hotplug = 1, + .no_hotplug = 1, .init = piix4_initfn, },{ /* end of list */