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(-)
