diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-12-15 09:05:26 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-12-15 09:05:26 +0000 |
| commit | 6d4e18925a65306afabaad7b63a4588c18919e99 (patch) | |
| tree | 3d46feb2372756bc5dcb37641f3c8030431fcf23 /qemu-config.c | |
| parent | 659f807c0a700317a7a0fae7a6e6ebfe68bfbbc4 (diff) | |
| parent | a64ae610b978dfd8ccfb7f6c5d4cfe62d7542fbd (diff) | |
| download | focaccia-qemu-6d4e18925a65306afabaad7b63a4588c18919e99.tar.gz focaccia-qemu-6d4e18925a65306afabaad7b63a4588c18919e99.zip | |
Merge branch 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf
* 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf: (40 commits) pseries: Increase default NVRAM size target-ppc: Don't use hwaddr to represent hardware state PPC: e500: pci: Export slot2irq calculation PPC: E500plat: Make a lot of PCI slots available PPC: E500: Move PCI slot information into params PPC: E500: Generate dt pci irq map dynamically PPC: E500: PCI: Make IRQ calculation more generic PPC: E500: PCI: Make first slot qdev settable openpic: Accelerate pending irq search openpic: fix minor coding style issues MSI-X: Fix endianness PPC: e500: Declare pci bridge as bridge PPC: e500: Add MSI support openpic: add Shared MSI support openpic: make brr1 model specific openpic: convert to qdev openpic: remove irq_out openpic: rename openpic_t to OpenPICState openpic: convert simple reg operations to builtin bitops openpic: remove unused type variable ...
Diffstat (limited to 'qemu-config.c')
| -rw-r--r-- | qemu-config.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qemu-config.c b/qemu-config.c index 54db9813e8..b4ce0d8034 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -579,6 +579,10 @@ static QemuOptsList qemu_machine_opts = { .name = "usb", .type = QEMU_OPT_BOOL, .help = "Set on/off to enable/disable usb", + }, { + .name = "nvram", + .type = QEMU_OPT_STRING, + .help = "Drive backing persistent NVRAM", }, { /* End of list */ } }, |