From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHHid-0007l1-FS for qemu-devel@nongnu.org; Thu, 07 Jan 2016 16:03:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHHib-0006yL-3s for qemu-devel@nongnu.org; Thu, 07 Jan 2016 16:03:39 -0500 From: Max Reitz Date: Thu, 7 Jan 2016 22:03:28 +0100 Message-Id: <1452200608-524-3-git-send-email-mreitz@redhat.com> In-Reply-To: <1452200608-524-1-git-send-email-mreitz@redhat.com> References: <1452200608-524-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] hw/sd: Implement is_tray_open() BlockDevOp List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Markus Armbruster , qemu-stable@nongnu.org, Stefan Hajnoczi , Max Reitz This makes the change HMP/QMP command on SD devices work again, after it has been broken in commit de2c6c0536c5c5ebb6e0ce7dcfd8fa9476edab52. Reported-by: Peter Maydell Cc: qemu-stable Signed-off-by: Max Reitz --- hw/sd/sd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 0751ba2..7d1e1cb 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -439,8 +439,15 @@ static void sd_cardchange(void *opaque, bool load) } } +static bool sd_is_tray_open(void *opaque) +{ + SDState *sd = opaque; + return !sd->medium_inserted; +} + static const BlockDevOps sd_block_ops = { .change_media_cb = sd_cardchange, + .is_tray_open = sd_is_tray_open, }; static const VMStateDescription sd_vmstate = { -- 2.6.4