aboutsummaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorAnthony Liguori <anthony@codemonkey.ws>2013-09-03 12:31:07 -0500
committerAnthony Liguori <anthony@codemonkey.ws>2013-09-03 12:31:07 -0500
commit9889e04ac193cad7fa0526573ce0cc752dcabb99 (patch)
treeba28c7e9e99eb96deaaa9da99609a441fef0ae29 /vl.c
parent5cff81f098a57762ab937bfbedb298e658af2c7f (diff)
parent23fe2b3f9e7df8da53ac1bc32c6875254911d7f4 (diff)
downloadqemu-9889e04ac193cad7fa0526573ce0cc752dcabb99.zip
qemu-9889e04ac193cad7fa0526573ce0cc752dcabb99.tar.gz
qemu-9889e04ac193cad7fa0526573ce0cc752dcabb99.tar.bz2
Merge remote-tracking branch 'mst/tags/for_anthony' into staging
pc,pci,virtio fixes and cleanups This includes pc and pci cleanups and enhancements, and a virtio bugfix for level interrupts. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Sun 01 Sep 2013 03:15:36 AM CDT using RSA key ID D28D5469 # gpg: Can't check signature: public key not found # By Michael S. Tsirkin (3) and others # Via Michael S. Tsirkin * mst/tags/for_anthony: virtio_pci: fix level interrupts with irqfd pc: reduce duplication, fix PIIX descriptions hw: Clean up bogus default boot order pci: add config space access traces pc: fix regression for 64 bit PCI memory pci: Introduce helper to retrieve a PCI device's DMA address space Message-id: 1378023590-11109-1-git-send-email-mst@redhat.com Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vl.c b/vl.c
index dfbc071..b4b119a 100644
--- a/vl.c
+++ b/vl.c
@@ -4123,7 +4123,7 @@ int main(int argc, char **argv, char **envp)
kernel_cmdline = qemu_opt_get(machine_opts, "append");
if (!boot_order) {
- boot_order = machine->boot_order;
+ boot_order = machine->default_boot_order;
}
opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL);
if (opts) {
@@ -4311,7 +4311,7 @@ int main(int argc, char **argv, char **envp)
qdev_machine_init();
QEMUMachineInitArgs args = { .ram_size = ram_size,
- .boot_device = boot_order,
+ .boot_order = boot_order,
.kernel_filename = kernel_filename,
.kernel_cmdline = kernel_cmdline,
.initrd_filename = initrd_filename,