[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/20] machine: Copy QEMUMachine's fields to MachineC
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 03/20] machine: Copy QEMUMachine's fields to MachineClass |
Date: |
Mon, 5 May 2014 21:03:47 +0200 |
From: Marcel Apfelbaum <address@hidden>
In order to eliminate the QEMUMachine indirection,
add its fields directly to MachineClass.
Do not yet remove qemu_machine field because it is
still in use by sPAPR.
Signed-off-by: Marcel Apfelbaum <address@hidden>
[AF: Copied fields for sPAPR, too]
Signed-off-by: Andreas Färber <address@hidden>
---
hw/ppc/spapr.c | 24 ++++++++++++++++++++++++
include/hw/boards.h | 24 ++++++++++++++++++++++++
vl.c | 23 +++++++++++++++++++++++
3 files changed, 71 insertions(+)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index a11e121..5192702 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1493,8 +1493,32 @@ static void spapr_machine_class_init(ObjectClass *oc,
void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
FWPathProviderClass *fwc = FW_PATH_PROVIDER_CLASS(oc);
+ QEMUMachine *qm = data;
mc->qemu_machine = data;
+
+ mc->name = qm->name;
+ mc->alias = qm->alias;
+ mc->desc = qm->desc;
+ mc->init = qm->init;
+ mc->reset = qm->reset;
+ mc->hot_add_cpu = qm->hot_add_cpu;
+ mc->kvm_type = qm->kvm_type;
+ mc->block_default_type = qm->block_default_type;
+ mc->max_cpus = qm->max_cpus;
+ mc->no_serial = qm->no_serial;
+ mc->no_parallel = qm->no_parallel;
+ mc->use_virtcon = qm->use_virtcon;
+ mc->use_sclp = qm->use_sclp;
+ mc->no_floppy = qm->no_floppy;
+ mc->no_cdrom = qm->no_cdrom;
+ mc->no_sdcard = qm->no_sdcard;
+ mc->is_default = qm->is_default;
+ mc->default_machine_opts = qm->default_machine_opts;
+ mc->default_boot_order = qm->default_boot_order;
+ mc->compat_props = qm->compat_props;
+ mc->hw_version = qm->hw_version;
+
fwc->get_dev_path = spapr_get_fw_dev_path;
}
diff --git a/include/hw/boards.h b/include/hw/boards.h
index aaaa871..c5f503d 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -77,6 +77,30 @@ struct MachineClass {
/*< public >*/
QEMUMachine *qemu_machine;
+
+ const char *name;
+ const char *alias;
+ const char *desc;
+
+ void (*init)(QEMUMachineInitArgs *args);
+ void (*reset)(void);
+ void (*hot_add_cpu)(const int64_t id, Error **errp);
+ int (*kvm_type)(const char *arg);
+
+ BlockInterfaceType block_default_type;
+ int max_cpus;
+ unsigned int no_serial:1,
+ no_parallel:1,
+ use_virtcon:1,
+ use_sclp:1,
+ no_floppy:1,
+ no_cdrom:1,
+ no_sdcard:1;
+ int is_default;
+ const char *default_machine_opts;
+ const char *default_boot_order;
+ GlobalProperty *compat_props;
+ const char *hw_version;
};
/**
diff --git a/vl.c b/vl.c
index 236f95e..3229c2f 100644
--- a/vl.c
+++ b/vl.c
@@ -1588,8 +1588,31 @@ MachineState *current_machine;
static void machine_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
+ QEMUMachine *qm = data;
mc->qemu_machine = data;
+
+ mc->name = qm->name;
+ mc->alias = qm->alias;
+ mc->desc = qm->desc;
+ mc->init = qm->init;
+ mc->reset = qm->reset;
+ mc->hot_add_cpu = qm->hot_add_cpu;
+ mc->kvm_type = qm->kvm_type;
+ mc->block_default_type = qm->block_default_type;
+ mc->max_cpus = qm->max_cpus;
+ mc->no_serial = qm->no_serial;
+ mc->no_parallel = qm->no_parallel;
+ mc->use_virtcon = qm->use_virtcon;
+ mc->use_sclp = qm->use_sclp;
+ mc->no_floppy = qm->no_floppy;
+ mc->no_cdrom = qm->no_cdrom;
+ mc->no_sdcard = qm->no_sdcard;
+ mc->is_default = qm->is_default;
+ mc->default_machine_opts = qm->default_machine_opts;
+ mc->default_boot_order = qm->default_boot_order;
+ mc->compat_props = qm->compat_props;
+ mc->hw_version = qm->hw_version;
}
int qemu_register_machine(QEMUMachine *m)
--
1.8.4.5
- [Qemu-devel] [PULL 10/20] arm: Clean up fragile use of error_is_set() in realize() methods, (continued)
- [Qemu-devel] [PULL 10/20] arm: Clean up fragile use of error_is_set() in realize() methods, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 12/20] qtest: Assure that init_socket()'s listen() does not fail, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 01/20] qdev: Fix crash by validating the object type, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 05/20] machine: Replace QEMUMachine by MachineClass in accelerator configuration, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 13/20] qtest: Add error reporting to socket_accept(), Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 16/20] tests: Add es1370 qtest, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 18/20] tests: Add ioh3420 qtest, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 14/20] qtest: Be paranoid about accept() addrlen argument, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 04/20] vl.c: Replace QEMUMachine with MachineClass in QEMUMachineInitArgs, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 06/20] machine: Remove QEMUMachine indirection from MachineClass, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 03/20] machine: Copy QEMUMachine's fields to MachineClass,
Andreas Färber <=
- [Qemu-devel] [PULL 09/20] qom: Clean up fragile use of error_is_set() in set() methods, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 08/20] hw: Consistently name Error ** objects errp, and not err, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 15/20] tests: Add ac97 qtest, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 20/20] PortioList: Store PortioList in device state, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 17/20] tests: Add intel-hda qtests, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 07/20] hw: Consistently name Error * objects err, and not errp, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 19/20] tests: Add EHCI qtest, Andreas Färber, 2014/05/05
- Re: [Qemu-devel] [PULL 00/20] QOM devices patch queue 2014-05-05, Peter Maydell, 2014/05/07