From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50359) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QN2Ng-0002aq-BG for qemu-devel@nongnu.org; Thu, 19 May 2011 08:31:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QN2Ne-0003wy-Np for qemu-devel@nongnu.org; Thu, 19 May 2011 08:31:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52748) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QN2Ne-0003ws-FK for qemu-devel@nongnu.org; Thu, 19 May 2011 08:31:06 -0400 From: Kevin Wolf Date: Thu, 19 May 2011 14:33:28 +0200 Message-Id: <1305808412-16994-15-git-send-email-kwolf@redhat.com> In-Reply-To: <1305808412-16994-1-git-send-email-kwolf@redhat.com> References: <1305808412-16994-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 14/18] defaults: ide-cd, ide-hd and scsi-cd devices suppress default CD-ROM List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster ide-hd has to suppress the default CD-ROM, or else you can't put one on secondary master without -nodefaults. Unlike legacy scsi-disk, scsi-cd suppresses default CD-ROM. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- vl.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/vl.c b/vl.c index bffba69..b362871 100644 --- a/vl.c +++ b/vl.c @@ -279,7 +279,10 @@ static struct { { .driver = "isa-serial", .flag = &default_serial }, { .driver = "isa-parallel", .flag = &default_parallel }, { .driver = "isa-fdc", .flag = &default_floppy }, + { .driver = "ide-cd", .flag = &default_cdrom }, + { .driver = "ide-hd", .flag = &default_cdrom }, { .driver = "ide-drive", .flag = &default_cdrom }, + { .driver = "scsi-cd", .flag = &default_cdrom }, { .driver = "virtio-serial-pci", .flag = &default_virtcon }, { .driver = "virtio-serial-s390", .flag = &default_virtcon }, { .driver = "virtio-serial", .flag = &default_virtcon }, -- 1.7.2.3