From patchwork Tue May 15 15:26:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 159368 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7EB9EB6FC3 for ; Wed, 16 May 2012 01:31:49 +1000 (EST) Received: from localhost ([::1]:58441 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUJj1-0007VY-87 for incoming@patchwork.ozlabs.org; Tue, 15 May 2012 11:31:47 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56750) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUJi8-0006qa-2P for qemu-devel@nongnu.org; Tue, 15 May 2012 11:31:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SUJhP-0006O2-Dk for qemu-devel@nongnu.org; Tue, 15 May 2012 11:30:51 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:52999) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUJhN-0006Ha-QS for qemu-devel@nongnu.org; Tue, 15 May 2012 11:30:06 -0400 X-IronPort-AV: E=Sophos;i="4.75,595,1330923600"; d="scan'208";a="194910353" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 15 May 2012 11:27:12 -0400 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.213.0; Tue, 15 May 2012 11:27:11 -0400 Received: from [10.80.3.61] (helo=perard.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1SUJeZ-00026H-EJ; Tue, 15 May 2012 16:27:11 +0100 From: Anthony PERARD To: QEMU-devel Date: Tue, 15 May 2012 16:26:36 +0100 Message-ID: <1337095599-28836-2-git-send-email-anthony.perard@citrix.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1337095599-28836-1-git-send-email-anthony.perard@citrix.com> References: <1337095599-28836-1-git-send-email-anthony.perard@citrix.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.63 Cc: Anthony PERARD , Stefano Stabellini , "Michael S. Tsirkin" , Anthony Liguori , Xen Devel Subject: [Qemu-devel] [PATCH 1/4] Introduce a new hotplug state: Force eject. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This hotplug state will be used to remove a device without the guest cooperation. Signed-off-by: Anthony PERARD --- hw/acpi_piix4.c | 5 +++++ hw/pci.h | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 585da4e..dfd5a9d 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -587,6 +587,11 @@ static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev, return 0; } + if (state == PCI_FORCE_EJECT) { + acpi_piix_eject_slot(s, 1 << slot); + return 0; + } + if (state == PCI_HOTPLUG_ENABLED) { enable_device(s, slot); } else { diff --git a/hw/pci.h b/hw/pci.h index 8d0aa49..3b61e43 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -273,6 +273,7 @@ typedef enum { PCI_HOTPLUG_DISABLED, PCI_HOTPLUG_ENABLED, PCI_COLDPLUG_ENABLED, + PCI_FORCE_EJECT, } PCIHotplugState; typedef int (*pci_hotplug_fn)(DeviceState *qdev, PCIDevice *pci_dev,