From patchwork Fri Oct 26 17:21:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 194541 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 732952C008B for ; Sat, 27 Oct 2012 04:22:06 +1100 (EST) Received: from localhost ([::1]:45119 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRnbg-0006xp-7R for incoming@patchwork.ozlabs.org; Fri, 26 Oct 2012 13:22:04 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50438) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRnbS-0006mn-Nf for qemu-devel@nongnu.org; Fri, 26 Oct 2012 13:21:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TRnbR-0005bY-K0 for qemu-devel@nongnu.org; Fri, 26 Oct 2012 13:21:50 -0400 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:59971) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRnbQ-0005bN-UD for qemu-devel@nongnu.org; Fri, 26 Oct 2012 13:21:49 -0400 Received: from /spool/local by e28smtp07.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 26 Oct 2012 22:51:46 +0530 Received: from d28relay04.in.ibm.com (9.184.220.61) by e28smtp07.in.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 26 Oct 2012 22:51:43 +0530 Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay04.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q9QHLgf65833016 for ; Fri, 26 Oct 2012 22:51:42 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q9QMpX3r004485 for ; Sat, 27 Oct 2012 09:51:33 +1100 Received: from titi.austin.rr.com ([9.57.74.46]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q9QMpL7p003796; Sat, 27 Oct 2012 09:51:30 +1100 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Fri, 26 Oct 2012 12:21:27 -0500 Message-Id: <1351272088-7942-4-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1351272088-7942-1-git-send-email-aliguori@us.ibm.com> References: <1351272088-7942-1-git-send-email-aliguori@us.ibm.com> x-cbid: 12102617-8878-0000-0000-0000048745F4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 122.248.162.7 Cc: Amit Shah , Paolo Bonzini , Anthony Liguori , Andreas Faerber Subject: [Qemu-devel] [PATCH 3/4] machine: add default_devices field to QEMUMachine X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This allows a machine to describe default devices that are only available when -nodefaults is not present. Signed-off-by: Anthony Liguori --- hw/boards.h | 6 ++++++ vl.c | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/hw/boards.h b/hw/boards.h index 813d0e5..85b2887 100644 --- a/hw/boards.h +++ b/hw/boards.h @@ -18,6 +18,11 @@ typedef void QEMUMachineInitFunc(QEMUMachineInitArgs *args); typedef void QEMUMachineResetFunc(void); +typedef struct DeviceDescription { + const char *description; +} DeviceDescription; + + typedef struct QEMUMachine { const char *name; const char *alias; @@ -37,6 +42,7 @@ typedef struct QEMUMachine { GlobalProperty *compat_props; struct QEMUMachine *next; const char *hw_version; + DeviceDescription *default_devices; } QEMUMachine; int qemu_register_machine(QEMUMachine *m); diff --git a/vl.c b/vl.c index ffadbb6..f1285b8 100644 --- a/vl.c +++ b/vl.c @@ -276,6 +276,7 @@ static int default_floppy = 1; static int default_cdrom = 1; static int default_sdcard = 1; static int default_vga = 1; +static int nodefaults = 0; static struct { const char *driver; @@ -3275,6 +3276,7 @@ int main(int argc, char **argv, char **envp) default_cdrom = 0; default_sdcard = 0; default_vga = 0; + nodefaults = 1; break; case QEMU_OPTION_xen_domid: if (!(xen_available())) { @@ -3692,6 +3694,17 @@ int main(int argc, char **argv, char **envp) } qemu_add_globals(); + if (!nodefaults && machine->default_devices) { + int i; + + for (i = 0; machine->default_devices[i].description; i++) { + if (!qemu_opts_parse(qemu_find_opts("device"), + machine->default_devices[i].description, 1)) { + exit(1); + } + } + } + qdev_machine_init(); QEMUMachineInitArgs args = { .ram_size = ram_size,