From patchwork Wed Dec 16 13:25:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 41259 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 170F6B6EEC for ; Thu, 17 Dec 2009 00:27:41 +1100 (EST) Received: from localhost ([127.0.0.1]:36418 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKtuj-00011r-6y for incoming@patchwork.ozlabs.org; Wed, 16 Dec 2009 08:27:37 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NKtt0-0000Vx-EG for qemu-devel@nongnu.org; Wed, 16 Dec 2009 08:25:50 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NKtsv-0000T8-3y for qemu-devel@nongnu.org; Wed, 16 Dec 2009 08:25:49 -0500 Received: from [199.232.76.173] (port=37364 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKtsu-0000Sa-Mj for qemu-devel@nongnu.org; Wed, 16 Dec 2009 08:25:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:29698) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NKtst-0001g7-Vu for qemu-devel@nongnu.org; Wed, 16 Dec 2009 08:25:44 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBGDPh2T031250 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 16 Dec 2009 08:25:43 -0500 Received: from zweiblum.home.kraxel.org (vpn2-9-244.ams2.redhat.com [10.36.9.244]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBGDPfNT018883; Wed, 16 Dec 2009 08:25:42 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 0610570FC9; Wed, 16 Dec 2009 14:25:40 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 16 Dec 2009 14:25:40 +0100 Message-Id: <1260969940-26796-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1260969940-26796-1-git-send-email-kraxel@redhat.com> References: <1260969940-26796-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [FOR 0.12 PATCH 2/2] defaults: update device_list[] X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add isa-fdc (disables default_floppy). Add ide-drive (disables default_cdrom). Also walk the -global QemuOpts, so we'll catch -global isa-fdc.drive{A,B}= too. Signed-off-by: Gerd Hoffmann --- qemu-config.h | 1 + vl.c | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/qemu-config.h b/qemu-config.h index 34dfadc..dd89ae4 100644 --- a/qemu-config.h +++ b/qemu-config.h @@ -7,6 +7,7 @@ extern QemuOptsList qemu_device_opts; extern QemuOptsList qemu_netdev_opts; extern QemuOptsList qemu_net_opts; extern QemuOptsList qemu_rtc_opts; +extern QemuOptsList qemu_global_opts; extern QemuOptsList qemu_mon_opts; int qemu_set_option(const char *str); diff --git a/vl.c b/vl.c index 0318c56..f53807f 100644 --- a/vl.c +++ b/vl.c @@ -285,6 +285,8 @@ static struct { } default_list[] = { { .driver = "isa-serial", .flag = &default_serial }, { .driver = "isa-parallel", .flag = &default_parallel }, + { .driver = "isa-fdc", .flag = &default_floppy }, + { .driver = "ide-drive", .flag = &default_cdrom }, { .driver = "virtio-console-pci", .flag = &default_virtcon }, { .driver = "virtio-console-s390", .flag = &default_virtcon }, { .driver = "VGA", .flag = &default_vga }, @@ -5701,6 +5703,7 @@ int main(int argc, char **argv, char **envp) } qemu_opts_foreach(&qemu_device_opts, default_driver_check, NULL, 0); + qemu_opts_foreach(&qemu_global_opts, default_driver_check, NULL, 0); if (machine->no_serial) { default_serial = 0;