From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NGEcZ-0007lw-Nt for qemu-devel@nongnu.org; Thu, 03 Dec 2009 11:33:35 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NGEcU-0007gO-Bb for qemu-devel@nongnu.org; Thu, 03 Dec 2009 11:33:35 -0500 Received: from [199.232.76.173] (port=58400 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGEcU-0007g5-1H for qemu-devel@nongnu.org; Thu, 03 Dec 2009 11:33:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17326) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NGEcT-0000B6-N2 for qemu-devel@nongnu.org; Thu, 03 Dec 2009 11:33:29 -0500 From: Eduardo Habkost Date: Thu, 3 Dec 2009 14:33:19 -0200 Message-Id: <1259858001-1273-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 0/2] integrate eject/uneject fixes List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Naphtali Sprei , qemu-devel@nongnu.org, Luiz Capitulino This series contains two patches that were submitted previously, but conflict with each other. This series contains both to make sure they are applied on the right order and that there are no mismerges. This should fix a mismerge that is present on the current staging tree (a closing bracket is missing on eject_device()). Naphtali's patch should have included the bdrv_forget_fname() call inside the bdrv_is_inserted() if block. But instead of fixing it, it can be simply applied after my patch. Eduardo Habkost (1): monitor: allow device to be ejected if no disk is inserted Naphtali Sprei (1): Fix for cdrom un-eject block.c | 24 ++++++++++++++++++++---- block.h | 1 + block_int.h | 1 + hw/ide/core.c | 35 +++++++++++++++++++++++++---------- monitor.c | 21 ++++++++++----------- 5 files changed, 57 insertions(+), 25 deletions(-)