From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJV3c-0007kO-C8 for qemu-devel@nongnu.org; Mon, 18 Aug 2014 18:05:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XJV3T-0006OO-7k for qemu-devel@nongnu.org; Mon, 18 Aug 2014 18:05:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28473) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJV3S-0006KF-UT for qemu-devel@nongnu.org; Mon, 18 Aug 2014 18:05:31 -0400 From: John Snow Date: Mon, 18 Aug 2014 18:05:16 -0400 Message-Id: <1408399520-12778-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [RFC 0/4] Adding -cdrom, -hd[abcd] and -drive file=... to Q35 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, jsnow@redhat.com, armbru@redhat.com, stefanha@redhat.com, agraf@suse.de Currently, the drive definitions created by drive_new() when using the -drive file=...[,if=ide] or -cdrom or -hd[abcd] options are not picked up by the Q35 initialization routine. To fix this, we have to add hooks to search for these drives using something like pc_piix's ide_drive_get and then add them using something like pci_ide_create_devs. Where it gets slightly wonky is the fact that if=ide is specified to use two devices per bus, whereas AHCI does not utilize that same master/slave mechanic. Therefore, many places inside of blockdev.c where we add and define new drives use incorrect math for AHCI devices and try to place them on impossible buses. Notably -hdb and -hdd would become inaccessible. To remedy this, I added a new interface type, IF_AHCI. Corresponding to this change, I modified the default machine properties for Q35 to use this interface as a default. The changes appear to work well, but where I'd like some feedback is what should happen if people do something like: qemu -M q35 -drive if=ide,file=fedora.qcow2 The code as presented here is not going to look for or attempt to connect IDE devices, because it is now looking for /AHCI/ devices. At worst, this may break a few existing scripts, but I actually think that since the if=ide,file=... shorthand never worked to begin with, the impact might actually be minimal. But since the legacy IDE interface of the ICH9 is as of yet unemulated, the if=ide drives don't have a reasonable place to go yet. I am also not sure what a reasonable way to handle people specifying BOTH if=ide and if=ahci drives would be. John Snow (4): blockdev: add if_get_max_devs blockdev: add IF_AHCI to support -cdrom and -hd[a-d] ide: update ide_drive_get to work with both PCI-IDE and AHCI interfaces ahci: implement -cdrom and -hd[a-d] blockdev.c | 18 +++++++++++++++--- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 4 ++++ hw/ide/ahci.c | 17 +++++++++++++++++ hw/ide/ahci.h | 2 ++ hw/ide/core.c | 11 +++++++---- include/hw/ide.h | 3 ++- include/sysemu/blockdev.h | 3 ++- 8 files changed, 50 insertions(+), 10 deletions(-) -- 1.9.3