[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 44/55] spitz tosa: Simplify "drive is suitable for m
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 44/55] spitz tosa: Simplify "drive is suitable for microdrive" test |
Date: |
Wed, 20 Jul 2011 18:24:18 +0200 |
We try the drive defined with -drive if=ide,index=0 (or equivalent
sugar). We use it only if (dinfo && bdrv_is_inserted(dinfo->bdrv) &&
!bdrv_is_removable(dinfo->bdrv)). This is a convoluted way to test
for "drive media can't be removed".
The only way to create such a drive with -drive if=ide is media=cdrom.
And that sets dinfo->media_cd, so just test that.
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/spitz.c | 10 +++-------
hw/tosa.c | 10 +++-------
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/hw/spitz.c b/hw/spitz.c
index 006f7a9..c743ae0 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -706,17 +706,13 @@ static void spitz_ssp_attach(PXA2xxState *cpu)
static void spitz_microdrive_attach(PXA2xxState *cpu, int slot)
{
PCMCIACardState *md;
- BlockDriverState *bs;
DriveInfo *dinfo;
dinfo = drive_get(IF_IDE, 0, 0);
- if (!dinfo)
+ if (!dinfo || dinfo->media_cd)
return;
- bs = dinfo->bdrv;
- if (bdrv_is_inserted(bs) && !bdrv_is_removable(bs)) {
- md = dscm1xxxx_init(dinfo);
- pxa2xx_pcmcia_attach(cpu->pcmcia[slot], md);
- }
+ md = dscm1xxxx_init(dinfo);
+ pxa2xx_pcmcia_attach(cpu->pcmcia[slot], md);
}
/* Wm8750 and Max7310 on I2C */
diff --git a/hw/tosa.c b/hw/tosa.c
index a7967a2..7b407f4 100644
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -51,17 +51,13 @@
static void tosa_microdrive_attach(PXA2xxState *cpu)
{
PCMCIACardState *md;
- BlockDriverState *bs;
DriveInfo *dinfo;
dinfo = drive_get(IF_IDE, 0, 0);
- if (!dinfo)
+ if (!dinfo || dinfo->media_cd)
return;
- bs = dinfo->bdrv;
- if (bdrv_is_inserted(bs) && !bdrv_is_removable(bs)) {
- md = dscm1xxxx_init(dinfo);
- pxa2xx_pcmcia_attach(cpu->pcmcia[0], md);
- }
+ md = dscm1xxxx_init(dinfo);
+ pxa2xx_pcmcia_attach(cpu->pcmcia[0], md);
}
static void tosa_out_switch(void *opaque, int line, int level)
--
1.7.2.3
- Re: [Qemu-devel] [PATCH 35/55] scsi-disk: Avoid physical/virtual tray state mismatch, (continued)
- [Qemu-devel] [PATCH 45/55] block: Clean up remaining users of "removable", Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 54/55] block: New change_media_cb() parameter load, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 55/55] ide/atapi scsi-disk: Make monitor eject -f, then change work, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 25/55] ide/atapi: Switch from BlockDriverState's locked to own tray_locked, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 44/55] spitz tosa: Simplify "drive is suitable for microdrive" test,
Markus Armbruster <=
- [Qemu-devel] [PATCH 43/55] savevm: Include writable devices with removable media, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 29/55] block: Drop medium lock tracking, ask device models instead, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 46/55] block: Drop BlockDriverState member removable, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 22/55] block: Drop tray status tracking, no longer used, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 28/55] block: Leave enforcing tray lock to device models, Markus Armbruster, 2011/07/20