From patchwork Tue Feb 7 18:09:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 139991 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8382CB71A9 for ; Wed, 8 Feb 2012 05:47:14 +1100 (EST) Received: from localhost ([::1]:60207 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RupV5-0005yC-LT for incoming@patchwork.ozlabs.org; Tue, 07 Feb 2012 13:10:43 -0500 Received: from eggs.gnu.org ([140.186.70.92]:52915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RupUd-0005Rs-Vn for qemu-devel@nongnu.org; Tue, 07 Feb 2012 13:10:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RupUT-0003d7-Lc for qemu-devel@nongnu.org; Tue, 07 Feb 2012 13:10:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:14577) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RupUT-0003b3-9J for qemu-devel@nongnu.org; Tue, 07 Feb 2012 13:10:05 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q17IA242027765 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 7 Feb 2012 13:10:02 -0500 Received: from localhost (ovpn-116-74.ams2.redhat.com [10.36.116.74]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q17IA0qC006523; Tue, 7 Feb 2012 13:10:01 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 7 Feb 2012 16:09:47 -0200 Message-Id: <1328638189-9534-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1328638189-9534-1-git-send-email-lcapitulino@redhat.com> References: <1328638189-9534-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, eblake@redhat.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 3/5] block: bdrv_eject(): Add tray_changed parameter 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 It's true if the tray has changed its state. This is going to be used by the next commit. Signed-off-by: Luiz Capitulino --- block.c | 2 +- block.h | 2 +- block/raw.c | 2 +- hw/ide/atapi.c | 2 +- hw/ide/core.c | 2 +- hw/scsi-disk.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/block.c b/block.c index 4042ada..77ace49 100644 --- a/block.c +++ b/block.c @@ -3560,7 +3560,7 @@ int bdrv_media_changed(BlockDriverState *bs) /** * If eject_flag is TRUE, eject the media. Otherwise, close the tray */ -void bdrv_eject(BlockDriverState *bs, bool eject_flag) +void bdrv_eject(BlockDriverState *bs, bool eject_flag, bool tray_changed) { BlockDriver *drv = bs->drv; diff --git a/block.h b/block.h index ce8c5ed..1d4cb94 100644 --- a/block.h +++ b/block.h @@ -257,7 +257,7 @@ int bdrv_enable_write_cache(BlockDriverState *bs); int bdrv_is_inserted(BlockDriverState *bs); int bdrv_media_changed(BlockDriverState *bs); void bdrv_lock_medium(BlockDriverState *bs, bool locked); -void bdrv_eject(BlockDriverState *bs, bool eject_flag); +void bdrv_eject(BlockDriverState *bs, bool eject_flag, bool tray_changed); void bdrv_get_format(BlockDriverState *bs, char *buf, int buf_size); BlockDriverState *bdrv_find(const char *name); BlockDriverState *bdrv_next(BlockDriverState *bs); diff --git a/block/raw.c b/block/raw.c index 1cdac0c..8343df4 100644 --- a/block/raw.c +++ b/block/raw.c @@ -63,7 +63,7 @@ static int raw_media_changed(BlockDriverState *bs) static void raw_eject(BlockDriverState *bs, bool eject_flag) { - bdrv_eject(bs->file, eject_flag); + bdrv_eject(bs->file, eject_flag, false); } static void raw_lock_medium(BlockDriverState *bs, bool locked) diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 0adb27b..d2e2a84 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -883,7 +883,7 @@ static void cmd_start_stop_unit(IDEState *s, uint8_t* buf) ide_atapi_cmd_error(s, sense, ASC_MEDIA_REMOVAL_PREVENTED); return; } - bdrv_eject(s->bs, !start); + bdrv_eject(s->bs, !start, s->tray_open != !start); s->tray_open = !start; } diff --git a/hw/ide/core.c b/hw/ide/core.c index 0856385..baac6c8 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2081,7 +2081,7 @@ static int ide_tray_state_post_load(void *opaque, int version_id) { IDEState *s = opaque; - bdrv_eject(s->bs, s->tray_open); + bdrv_eject(s->bs, s->tray_open, false); bdrv_lock_medium(s->bs, s->tray_locked); return 0; } diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 94f6af6..9dad9c1 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1050,7 +1050,7 @@ static int scsi_disk_emulate_start_stop(SCSIDiskReq *r) : SENSE_CODE(NOT_READY_REMOVAL_PREVENTED)); return -1; } - bdrv_eject(s->qdev.conf.bs, !start); + bdrv_eject(s->qdev.conf.bs, !start, s->tray_open != !start); s->tray_open = !start; } return 0;