diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-05-12 08:06:06 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-05-12 08:06:06 -0500 |
commit | 89bb563f6912b3f538d6bdf5833881ed7cdbd923 (patch) | |
tree | 601d288a7cac548a018cd5f6bcb1c09af032ee9a /hw/boards.h | |
parent | 0225e254ae81c5638463cda8f5730f31619113b6 (diff) | |
parent | c962247883ffd957dd7f3bccb519803e2775ced2 (diff) |
Merge remote-tracking branch 'agraf/xen-next' into staging
Diffstat (limited to 'hw/boards.h')
-rw-r--r-- | hw/boards.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/boards.h b/hw/boards.h index 6f0f0d7925..716fd7b1a6 100644 --- a/hw/boards.h +++ b/hw/boards.h @@ -27,6 +27,7 @@ typedef struct QEMUMachine { no_cdrom:1, no_sdcard:1; int is_default; + const char *default_machine_opts; GlobalProperty *compat_props; struct QEMUMachine *next; } QEMUMachine; |