From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57701) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afqSz-000753-Ae for qemu-devel@nongnu.org; Tue, 15 Mar 2016 11:01:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afqSv-0006PU-14 for qemu-devel@nongnu.org; Tue, 15 Mar 2016 11:01:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42624) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afqSu-0006PQ-Rl for qemu-devel@nongnu.org; Tue, 15 Mar 2016 11:00:56 -0400 Date: Tue, 15 Mar 2016 17:00:51 +0200 From: "Michael S. Tsirkin" Message-ID: <1458053975-2410-13-git-send-email-mst@redhat.com> References: <1458053975-2410-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1458053975-2410-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v2 12/51] i386: expose floppy drive CMOS type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Eduardo Habkost , Laszlo Ersek , Kevin O'Connor , Roman Kagan , Paolo Bonzini , Marcel Apfelbaum , Igor Mammedov , John Snow , Richard Henderson From: Roman Kagan 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 Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/i386/pc.h | 1 + hw/i386/pc.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 79ffe5b..6151ba7 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); #define FW_CFG_IO_BASE 0x510 diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 56ec6cd..898f119 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -199,7 +199,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; -- MST