diff options
| author | Paolo Bonzini | 2020-11-02 15:44:36 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2020-12-15 18:51:55 +0100 |
| commit | f2ce39b4f067fe8b8de6104a2d8ac558d35c330b (patch) | |
| tree | 0d6c327eb7b5522347c7f465d403829af4f2ec6e /hw/ppc | |
| parent | ppc/spapr: cleanup -machine pseries,nvdimm=X handling (diff) | |
| download | qemu-f2ce39b4f067fe8b8de6104a2d8ac558d35c330b.tar.gz qemu-f2ce39b4f067fe8b8de6104a2d8ac558d35c330b.tar.xz qemu-f2ce39b4f067fe8b8de6104a2d8ac558d35c330b.zip | |
vl: make qemu_get_machine_opts static
Machine options can be retrieved as properties of the machine object.
Encourage that by removing the "easy" accessor to machine options.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/ppc')
| -rw-r--r-- | hw/ppc/e500.c | 5 | ||||
| -rw-r--r-- | hw/ppc/virtex_ml507.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 072e558c2d..c64b5d08bd 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -343,9 +343,8 @@ static int ppce500_load_device_tree(PPCE500MachineState *pms, pmc->pci_pio_base >> 32, pmc->pci_pio_base, 0x0, 0x10000, }; - QemuOpts *machine_opts = qemu_get_machine_opts(); - const char *dtb_file = qemu_opt_get(machine_opts, "dtb"); - const char *toplevel_compat = qemu_opt_get(machine_opts, "dt_compatible"); + const char *dtb_file = machine->dtb; + const char *toplevel_compat = machine->dt_compatible; if (dtb_file) { char *filename; diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 7f1bca928c..07fe49da0d 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -152,7 +152,7 @@ static int xilinx_load_device_tree(hwaddr addr, int r; const char *dtb_filename; - dtb_filename = qemu_opt_get(qemu_get_machine_opts(), "dtb"); + dtb_filename = current_machine->dtb; if (dtb_filename) { fdt = load_device_tree(dtb_filename, &fdt_size); if (!fdt) { |