[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 1/2] hw: Pass QEMUMachine to its init() method
From: |
armbru |
Subject: |
[Qemu-devel] [PATCH v3 1/2] hw: Pass QEMUMachine to its init() method |
Date: |
Wed, 30 Oct 2013 13:56:39 +0100 |
From: Markus Armbruster <address@hidden>
Put it in QEMUMachineInitArgs, so I don't have to touch every board.
Signed-off-by: Markus Armbruster <address@hidden>
---
include/hw/boards.h | 7 +++++--
vl.c | 3 ++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 5a7ae9f..2151460 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -6,7 +6,10 @@
#include "sysemu/blockdev.h"
#include "hw/qdev.h"
+typedef struct QEMUMachine QEMUMachine;
+
typedef struct QEMUMachineInitArgs {
+ const QEMUMachine *machine;
ram_addr_t ram_size;
const char *boot_order;
const char *kernel_filename;
@@ -21,7 +24,7 @@ typedef void QEMUMachineResetFunc(void);
typedef void QEMUMachineHotAddCPUFunc(const int64_t id, Error **errp);
-typedef struct QEMUMachine {
+struct QEMUMachine {
const char *name;
const char *alias;
const char *desc;
@@ -43,7 +46,7 @@ typedef struct QEMUMachine {
GlobalProperty *compat_props;
struct QEMUMachine *next;
const char *hw_version;
-} QEMUMachine;
+};
int qemu_register_machine(QEMUMachine *m);
QEMUMachine *find_default_machine(void);
diff --git a/vl.c b/vl.c
index b42ac67..63338e4 100644
--- a/vl.c
+++ b/vl.c
@@ -4236,7 +4236,8 @@ int main(int argc, char **argv, char **envp)
qdev_machine_init();
- QEMUMachineInitArgs args = { .ram_size = ram_size,
+ QEMUMachineInitArgs args = { .machine = machine,
+ .ram_size = ram_size,
.boot_order = boot_order,
.kernel_filename = kernel_filename,
.kernel_cmdline = kernel_cmdline,
--
1.8.1.4
- Re: [Qemu-devel] [PATCH v3 2/2] smbios: Set system manufacturer, product & version by default, (continued)
- Re: [Qemu-devel] [PATCH v3 2/2] smbios: Set system manufacturer, product & version by default, Markus Armbruster, 2013/10/30
- Re: [Qemu-devel] [PATCH v3 2/2] smbios: Set system manufacturer, product & version by default, Michael S. Tsirkin, 2013/10/30
- Re: [Qemu-devel] [PATCH v3 2/2] smbios: Set system manufacturer, product & version by default, Markus Armbruster, 2013/10/30
- Re: [Qemu-devel] [PATCH v3 2/2] smbios: Set system manufacturer, product & version by default, Michael S. Tsirkin, 2013/10/30
- Re: [Qemu-devel] [PATCH v3 2/2] smbios: Set system manufacturer, product & version by default, Markus Armbruster, 2013/10/31
- Re: [Qemu-devel] [PATCH v3 2/2] smbios: Set system manufacturer, product & version by default, Eduardo Habkost, 2013/10/31
- Re: [Qemu-devel] [PATCH v3 2/2] smbios: Set system manufacturer, product & version by default, Markus Armbruster, 2013/10/30
- Re: [Qemu-devel] [PATCH v3 2/2] smbios: Set system manufacturer, product & version by default, Michael S. Tsirkin, 2013/10/30
- Re: [Qemu-devel] [PATCH v3 2/2] smbios: Set system manufacturer, product & version by default, Markus Armbruster, 2013/10/31
- Re: [Qemu-devel] [PATCH v3 2/2] smbios: Set system manufacturer, product & version by default, Michael S. Tsirkin, 2013/10/31
[Qemu-devel] [PATCH v3 1/2] hw: Pass QEMUMachine to its init() method,
armbru <=
Re: [Qemu-devel] [PATCH v3 0/2] smbios nicer defaults for DMI type 1 (System), Michael S. Tsirkin, 2013/10/30
[Qemu-devel] [PATCH v3 3/2] smbios: Decouple system product from QEMUMachine, Markus Armbruster, 2013/10/31