From patchwork Wed Feb 17 18:25:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Kagan X-Patchwork-Id: 8341991 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DCE22C0553 for ; Wed, 17 Feb 2016 18:26:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4CEC320386 for ; Wed, 17 Feb 2016 18:26:30 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 15E622039D for ; Wed, 17 Feb 2016 18:26:29 +0000 (UTC) Received: from localhost ([::1]:60428 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW6o0-000499-5O for patchwork-qemu-devel@patchwork.kernel.org; Wed, 17 Feb 2016 13:26:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54791) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW6nj-00048h-UX for qemu-devel@nongnu.org; Wed, 17 Feb 2016 13:26:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aW6nf-0001y3-Id for qemu-devel@nongnu.org; Wed, 17 Feb 2016 13:26:11 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:23861 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW6nf-0001wY-5F for qemu-devel@nongnu.org; Wed, 17 Feb 2016 13:26:07 -0500 Received: from rkaganb.sw.ru ([10.30.3.95]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u1HIPpZe032169; Wed, 17 Feb 2016 21:25:57 +0300 (MSK) From: Roman Kagan To: qemu-devel@nongnu.org Date: Wed, 17 Feb 2016 21:25:31 +0300 Message-Id: <1455733533-12030-3-git-send-email-rkagan@virtuozzo.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1455733533-12030-1-git-send-email-rkagan@virtuozzo.com> References: <1455733533-12030-1-git-send-email-rkagan@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: "Michael S. Tsirkin" , Laszlo Ersek , Kevin O'Connor , Roman Kagan , Igor Mammedov , Marcel Apfelbaum , Denis Lunev , John Snow Subject: [Qemu-devel] [PATCH v8 2/4] i386: expose floppy drive CMOS type 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Make it possible to query the CMOS type of a floppy drive outside of the source file where it's defined. It will allow to properly populate the corresponding ACPI objects and thus enable Windows on BIOS-less systems to access the floppy drives. Signed-off-by: Roman Kagan Cc: Igor Mammedov Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Cc: John Snow Cc: Laszlo Ersek Cc: Kevin O'Connor --- changes since v7: - split out from a bigger patch hw/i386/pc.c | 2 +- include/hw/i386/pc.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 0aeefd2..d7fea61 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -200,7 +200,7 @@ static void pic_irq_request(void *opaque, int irq, int level) #define REG_EQUIPMENT_BYTE 0x14 -static int cmos_get_fd_drive_type(FloppyDriveType fd0) +int cmos_get_fd_drive_type(FloppyDriveType fd0) { int val; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 8b3546e..472754c 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -265,6 +265,7 @@ typedef void (*cpu_set_smm_t)(int smm, void *arg); void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name); ISADevice *pc_find_fdc0(void); +int cmos_get_fd_drive_type(FloppyDriveType fd0); /* acpi_piix.c */