qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Peter Maydell <peter.maydell@linaro.org>,
	Eduardo Habkost <ehabkost@redhat.com>,
	qemu-block@nongnu.org, Laszlo Ersek <lersek@redhat.com>,
	Kevin O'Connor <kevin@koconnor.net>,
	Roman Kagan <rkagan@virtuozzo.com>,
	Marcel Apfelbaum <marcel@redhat.com>,
	Igor Mammedov <imammedo@redhat.com>, John Snow <jsnow@redhat.com>
Subject: [Qemu-devel] [PULL v2 13/51] fdc: add function to determine drive chs limits
Date: Tue, 15 Mar 2016 17:00:56 +0200	[thread overview]
Message-ID: <1458053975-2410-14-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1458053975-2410-1-git-send-email-mst@redhat.com>

From: Roman Kagan <rkagan@virtuozzo.com>

When populating ACPI objects for floppy drives one needs to provide the
maximum values for cylinder, sector, and head number the drive supports.

This patch adds a function that iterates through the array of predefined
floppy drive formats and returns the maximum values of c, h, s, out of
those matching the given floppy drive type.

Signed-off-by: Roman Kagan <rkagan@virtuozzo.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel@redhat.com>
Cc: John Snow <jsnow@redhat.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Kevin O'Connor <kevin@koconnor.net>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
---
 include/hw/block/fdc.h |  2 ++
 hw/block/fdc.c         | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h
index adce14f..1749dab 100644
--- a/include/hw/block/fdc.h
+++ b/include/hw/block/fdc.h
@@ -15,5 +15,7 @@ void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base,
                        DriveInfo **fds, qemu_irq *fdc_tc);
 
 FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i);
+void isa_fdc_get_drive_max_chs(FloppyDriveType type,
+                               uint8_t *maxc, uint8_t *maxh, uint8_t *maxs);
 
 #endif
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index 9838d21..fc3aef9 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -2557,6 +2557,29 @@ FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i)
     return isa->state.drives[i].drive;
 }
 
+void isa_fdc_get_drive_max_chs(FloppyDriveType type,
+                               uint8_t *maxc, uint8_t *maxh, uint8_t *maxs)
+{
+    const FDFormat *fdf;
+
+    *maxc = *maxh = *maxs = 0;
+    for (fdf = fd_formats; fdf->drive != FLOPPY_DRIVE_TYPE_NONE; fdf++) {
+        if (fdf->drive != type) {
+            continue;
+        }
+        if (*maxc < fdf->max_track) {
+            *maxc = fdf->max_track;
+        }
+        if (*maxh < fdf->max_head) {
+            *maxh = fdf->max_head;
+        }
+        if (*maxs < fdf->last_sect) {
+            *maxs = fdf->last_sect;
+        }
+    }
+    (*maxc)--;
+}
+
 static const VMStateDescription vmstate_isa_fdc ={
     .name = "fdc",
     .version_id = 2,
-- 
MST

  parent reply	other threads:[~2016-03-15 15:01 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-15 15:00 [Qemu-devel] [PULL v2 00/51] vhost, virtio, pci, pc, acpi Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 01/51] acpi: add aml_create_field() Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 02/51] acpi: add aml_concatenate() Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 03/51] acpi: allow using object as offset for OperationRegion Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 04/51] acpi: add build_append_named_dword, returning an offset in buffer Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 05/51] balloon: fix segfault and harden the stats queue Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 06/51] hw/virtio: fix double use of a virtio flag Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 07/51] hw/virtio: group virtio flags into an enum Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 08/51] virtio-balloon: add 'available' counter Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 09/51] vhost-user: verify that number of queues is less than MAX_QUEUE_NUM Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 10/51] pc-dimm: fix error handling in pc_dimm_check_memdev_is_busy() Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 11/51] i386/acpi: make floppy controller object dynamic Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 12/51] i386: expose floppy drive CMOS type Michael S. Tsirkin
2016-03-15 15:00 ` Michael S. Tsirkin [this message]
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 14/51] i386: populate floppy drive information in DSDT Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 15/51] i386: update expected DSDT Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 16/51] virtio-pci: call pci reset variant when guest requests reset Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 17/51] msi_supported -> msi_nonbroken Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 18/51] ich9lpc: fix typo Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 19/51] hw/acpi: fix Q35 support for legacy Windows OS Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 20/51] acpi-test-data: add _DIS methods Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 21/51] pci-ids: add virtio 1.0 ids to spec Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 22/51] nvdimm acpi: initialize the resource used by NVDIMM ACPI Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 23/51] nvdimm acpi: introduce patched dsm memory Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 24/51] nvdimm acpi: let qemu handle _DSM method Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 25/51] nvdimm acpi: emulate dsm method Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 26/51] vhost-user: fix use after free Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 27/51] vhost-user: remove useless is_server field Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 28/51] qemu-char: avoid potential double-free Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 29/51] qemu-char: remove all msgfds on disconnect Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 30/51] qemu-char: make tcp_chr_disconnect() reentrant-safe Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 31/51] pxb: cleanup Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 32/51] pc: acpi: remove NOP assignment Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 33/51] pc: init pcms->apic_id_limit once and use it throughout pc.c Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 34/51] machine: introduce MachineClass.possible_cpu_arch_ids() hook Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 35/51] pc: acpi: cleanup qdev_get_machine() calls Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 36/51] pc: acpi: SRAT: create only valid processor lapic entries Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 37/51] pc: acpi: create MADT.lapic entries only for valid lapics Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 38/51] pc: acpi: create Processor and Notify objects " Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 39/51] pc: acpi: drop cpu->found_cpus bitmap Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 40/51] pc: acpi: clarify why possible LAPIC entries must be present in MADT Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 41/51] MAINTAINERS: Add an entry for virtio header files Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 42/51] MAINTAINERS: machine core Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 43/51] ipmi: remove IPMI_CHECK_CMD_LEN() macro Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 44/51] ipmi: replace IPMI_ADD_RSP_DATA() macro with inline helpers Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 45/51] ipmi: remove IPMI_CHECK_RESERVATION() macro Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 46/51] ipmi: add rsp_buffer_set_error() helper Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 47/51] ipmi: add a realize function to the device class Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 48/51] ipmi: use a function to initialize the SDR table Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 49/51] ipmi: remove the need of an ending record in " Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 50/51] ipmi: add some local variables in ipmi_sdr_init Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 51/51] hw/acpi: fix GSI links UID Michael S. Tsirkin
2016-03-15 17:09 ` [Qemu-devel] [PULL v2 00/51] vhost, virtio, pci, pc, acpi Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1458053975-2410-14-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=kevin@koconnor.net \
    --cc=kwolf@redhat.com \
    --cc=lersek@redhat.com \
    --cc=marcel@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=rkagan@virtuozzo.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).