From: Anthony Liguori <aliguori@us.ibm.com>
To: qemu-devel@nongnu.org
Cc: Glauber Costa <glommer@redhat.com>,
Anthony Liguori <aliguori@us.ibm.com>
Subject: [Qemu-devel] [PATCH 12/22] machine: some sugary macros to simplify machine default options
Date: Mon, 7 Jun 2010 18:52:00 -0500 [thread overview]
Message-ID: <1275954730-8196-13-git-send-email-aliguori@us.ibm.com> (raw)
In-Reply-To: <1275954730-8196-1-git-send-email-aliguori@us.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
diff --git a/hw/boards.h b/hw/boards.h
index c7358ae..e05637b 100644
--- a/hw/boards.h
+++ b/hw/boards.h
@@ -33,6 +33,12 @@ int qemu_register_machine(QEMUMachine *m);
extern QEMUMachine *current_machine;
+#define QOPT_COMPAT(driver, property, value) \
+ QOPT_VALUE(driver "." property, value)
+
+#define QOPT_COMPAT_INT(driver, property, value) \
+ QOPT_VALUE(driver "." property, stringify(value))
+
#define COMMON_MACHINE_OPTS() \
{ \
.name = "driver", \
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 28c1408..104206c 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -190,18 +190,9 @@ static QEMUMachine pc_machine = {
.is_default = 1,
.opts_desc = pc_opts_desc,
.opts_default = (QemuOptValue[]) {
- {
- .name = "acpi",
- .value = "on",
- },
- {
- .name = "pci",
- .value = "on",
- },
- {
- .name = "cpu",
- .value = PC_DEFAULT_CPU_MODEL,
- },
+ QOPT_VALUE("acpi", "on"),
+ QOPT_VALUE("pci", "on"),
+ QOPT_VALUE("cpu", PC_DEFAULT_CPU_MODEL),
{ /* end of list */ }
},
};
@@ -213,25 +204,11 @@ static QEMUMachine pc_machine_v0_12 = {
.max_cpus = 255,
.opts_desc = pc_opts_desc,
.opts_default = (QemuOptValue[]) {
- {
- .name = "acpi",
- .value = "on",
- },
- {
- .name = "pci",
- .value = "on",
- },
- {
- .name = "cpu",
- .value = PC_DEFAULT_CPU_MODEL,
- },
- {
- .name = "virtio-serial-pci.max_nr_ports",
- .value = stringify(1),
- },{
- .name = "virtio-serial-pci.vectors",
- .value = stringify(0),
- },
+ QOPT_VALUE("acpi", "on"),
+ QOPT_VALUE("pci", "on"),
+ QOPT_VALUE("cpu", PC_DEFAULT_CPU_MODEL),
+ QOPT_COMPAT_INT("virtio-serial-pci", "max_nr_ports", 1),
+ QOPT_COMPAT_INT("virtio-serial-pci", "vectors", 0),
{ /* end of list */ }
},
};
@@ -243,37 +220,15 @@ static QEMUMachine pc_machine_v0_11 = {
.max_cpus = 255,
.opts_desc = pc_opts_desc,
.opts_default = (QemuOptValue[]) {
- {
- .name = "acpi",
- .value = "on",
- },
- {
- .name = "pci",
- .value = "on",
- },
- {
- .name = "cpu",
- .value = PC_DEFAULT_CPU_MODEL,
- },
- {
- .name = "virtio-blk-pci.vectors",
- .value = stringify(0),
- },{
- .name = "virtio-serial-pci.max_nr_ports",
- .value = stringify(1),
- },{
- .name = "virtio-serial-pci.vectors",
- .value = stringify(0),
- },{
- .name = "ide-drive.ver",
- .value = "0.11",
- },{
- .name = "scsi-disk.ver",
- .value = "0.11",
- },{
- .name = "PCI.rombar",
- .value = stringify(0),
- },
+ QOPT_VALUE("acpi", "on"),
+ QOPT_VALUE("pci", "on"),
+ QOPT_VALUE("cpu", PC_DEFAULT_CPU_MODEL),
+ QOPT_COMPAT_INT("virtio-blk-pci", "vectors", 0),
+ QOPT_COMPAT_INT("virtio-serial-pci", "max_nr_ports", 1),
+ QOPT_COMPAT_INT("virtio-serial-pci", "vectors", 0),
+ QOPT_COMPAT("ide-drive", "ver", "0.11"),
+ QOPT_COMPAT("scsi-disk", "ver", "0.11"),
+ QOPT_COMPAT_INT("PCI", "rombar", 0),
{ /* end of list */ }
}
};
@@ -285,46 +240,18 @@ static QEMUMachine pc_machine_v0_10 = {
.max_cpus = 255,
.opts_desc = pc_opts_desc,
.opts_default = (QemuOptValue[]) {
- {
- .name = "acpi",
- .value = "on",
- },
- {
- .name = "pci",
- .value = "on",
- },
- {
- .name = "cpu",
- .value = PC_DEFAULT_CPU_MODEL,
- },
- {
- .name = "virtio-blk-pci.class",
- .value = stringify(PCI_CLASS_STORAGE_OTHER),
- },{
- .name = "virtio-serial-pci.class",
- .value = stringify(PCI_CLASS_DISPLAY_OTHER),
- },{
- .name = "virtio-serial-pci.max_nr_ports",
- .value = stringify(1),
- },{
- .name = "virtio-serial-pci.vectors",
- .value = stringify(0),
- },{
- .name = "virtio-net-pci.vectors",
- .value = stringify(0),
- },{
- .name = "virtio-blk-pci.vectors",
- .value = stringify(0),
- },{
- .name = "ide-drive.ver",
- .value = "0.10",
- },{
- .name = "scsi-disk.ver",
- .value = "0.10",
- },{
- .name = "PCI.rombar",
- .value = stringify(0),
- },
+ QOPT_VALUE("acpi", "on"),
+ QOPT_VALUE("pci", "on"),
+ QOPT_VALUE("cpu", PC_DEFAULT_CPU_MODEL),
+ QOPT_COMPAT_INT("virtio-blk-pci", "class", PCI_CLASS_STORAGE_OTHER),
+ QOPT_COMPAT_INT("virtio-serial-pci", "class", PCI_CLASS_DISPLAY_OTHER),
+ QOPT_COMPAT_INT("virtio-net-pci", "vectors", 0),
+ QOPT_COMPAT_INT("virtio-blk-pci", "vectors", 0),
+ QOPT_COMPAT_INT("virtio-serial-pci", "max_nr_ports", 1),
+ QOPT_COMPAT_INT("virtio-serial-pci", "vectors", 0),
+ QOPT_COMPAT("ide-drive", "ver", "0.10"),
+ QOPT_COMPAT("scsi-disk", "ver", "0.10"),
+ QOPT_COMPAT_INT("PCI", "rombar", 0),
{ /* end of list */ }
},
};
@@ -335,18 +262,9 @@ static QEMUMachine isapc_machine = {
.opts_desc = pc_opts_desc,
.init = pc_init,
.opts_default = (QemuOptValue[]) {
- {
- .name = "acpi",
- .value = "off",
- },
- {
- .name = "pci",
- .value = "off",
- },
- {
- .name = "cpu",
- .value = "486",
- },
+ QOPT_VALUE("acpi", "off"),
+ QOPT_VALUE("pci", "off"),
+ QOPT_VALUE("cpu", "486"),
{ /* end of list */ }
},
.max_cpus = 1,
diff --git a/qemu-option.h b/qemu-option.h
index 85ab58e..5fc60ac 100644
--- a/qemu-option.h
+++ b/qemu-option.h
@@ -109,6 +109,12 @@ typedef struct QemuOptValue {
const char *value;
} QemuOptValue;
+#define QOPT_VALUE(_name, _value) \
+ { \
+ .name = _name, \
+ .value = _value, \
+ }
+
const char *qemu_opt_get(QemuOpts *opts, const char *name);
int qemu_opt_get_bool(QemuOpts *opts, const char *name, int defval);
uint64_t qemu_opt_get_number(QemuOpts *opts, const char *name, uint64_t defval);
--
1.7.0.4
next prev parent reply other threads:[~2010-06-07 23:52 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-07 23:51 [Qemu-devel] [PATCH 0/22] Refactor machine support Anthony Liguori
2010-06-07 23:51 ` [Qemu-devel] [PATCH 01/22] QemuOpts: fix a bug in QemuOpts when setting an option twice Anthony Liguori
2010-06-08 7:51 ` Gerd Hoffmann
2010-06-08 10:32 ` [Qemu-devel] " Paolo Bonzini
2010-06-08 13:07 ` Anthony Liguori
2010-06-08 13:44 ` Gerd Hoffmann
2010-06-08 15:17 ` Anthony Liguori
2010-06-08 15:37 ` Gerd Hoffmann
2010-06-08 16:04 ` Anthony Liguori
2010-06-09 7:01 ` Gerd Hoffmann
2010-06-08 14:38 ` Paul Brook
2010-06-08 15:14 ` Anthony Liguori
2010-06-07 23:51 ` [Qemu-devel] [PATCH 02/22] QemuOpts: make qemu_opts_validate() store the description list for later use Anthony Liguori
2010-06-07 23:51 ` [Qemu-devel] [PATCH 03/22] QemuOpts: add function to set QemuOpts from defaults Anthony Liguori
2010-06-07 23:51 ` [Qemu-devel] [PATCH 04/22] machine: package all init arguments into a QemuOpts (v2) Anthony Liguori
2010-06-07 23:51 ` [Qemu-devel] [PATCH 05/22] machine: pass all init options as a single QemuOpts Anthony Liguori
2010-06-08 7:58 ` Gerd Hoffmann
2010-06-07 23:51 ` [Qemu-devel] [PATCH 06/22] Make -acpi-enable a machine specific option Anthony Liguori
2010-06-07 23:51 ` [Qemu-devel] [PATCH 07/22] machine: introduce -machine option Anthony Liguori
2010-06-07 23:51 ` [Qemu-devel] [PATCH 08/22] machine: implement -kernel/-append/-initrd options in term of -machine Anthony Liguori
2010-06-07 23:51 ` [Qemu-devel] [PATCH 09/22] machine: implement -m in terms " Anthony Liguori
2010-06-07 23:51 ` [Qemu-devel] [PATCH 10/22] machine: allow boards to specify default values and use it in isapc Anthony Liguori
2010-06-08 8:03 ` Gerd Hoffmann
2010-06-08 13:09 ` Anthony Liguori
2010-06-08 13:29 ` Gerd Hoffmann
2010-06-07 23:51 ` [Qemu-devel] [PATCH 11/22] machine: replace compat_props with opts_default Anthony Liguori
2010-06-07 23:52 ` Anthony Liguori [this message]
2010-06-07 23:52 ` [Qemu-devel] [PATCH 13/22] machine: get rid of global default QEMUMachine members Anthony Liguori
2010-06-07 23:52 ` [Qemu-devel] [PATCH 14/22] machine: replace QEMUMachine.use_scsi with -machine default_drive Anthony Liguori
2010-06-07 23:52 ` [Qemu-devel] [PATCH 15/22] machine: make max_cpus a -machine option Anthony Liguori
2010-06-08 1:01 ` Paul Brook
2010-06-08 1:56 ` Anthony Liguori
2010-06-08 2:56 ` Paul Brook
2010-06-09 7:44 ` Jes Sorensen
2010-06-09 7:47 ` Jes Sorensen
2010-06-07 23:52 ` [Qemu-devel] [PATCH 16/22] machine: move default machine out of machine definitions Anthony Liguori
2010-06-07 23:52 ` [Qemu-devel] [PATCH 17/22] machine: kill machine->alias Anthony Liguori
2010-06-07 23:52 ` [Qemu-devel] [PATCH 18/22] machine: final conversion to pure QemuOpts Anthony Liguori
2010-06-07 23:52 ` [Qemu-devel] [PATCH 19/22] machine: introduce accel option to allow selection of kvm or tcg Anthony Liguori
2010-06-07 23:52 ` [Qemu-devel] [PATCH 20/22] machine: introduce machine core and split qemu_register_machine Anthony Liguori
2010-06-07 23:52 ` [Qemu-devel] [PATCH 21/22] machine: convert pc machines to split core vs machine API Anthony Liguori
2010-06-09 7:51 ` Jes Sorensen
2010-06-07 23:52 ` [Qemu-devel] [PATCH 22/22] machine: introduce -machine-def option to define a machine via config Anthony Liguori
2010-06-08 0:50 ` Anthony Liguori
2010-06-10 17:48 ` Daniel P. Berrange
2010-06-11 13:03 ` Daniel P. Berrange
2010-06-08 3:12 ` [Qemu-devel] [PATCH 0/22] Refactor machine support Paul Brook
2010-06-08 10:24 ` [Qemu-devel] " Paolo Bonzini
2010-06-08 14:30 ` Paul Brook
2010-06-08 15:28 ` Anthony Liguori
2010-06-08 15:36 ` Paul Brook
2010-06-08 15:58 ` Paolo Bonzini
2010-06-08 16:15 ` Anthony Liguori
2010-06-08 21:05 ` Alexander Graf
2010-06-08 21:16 ` Anthony Liguori
2010-06-08 17:23 ` Anthony Liguori
2010-06-09 2:11 ` Paul Brook
2010-06-09 13:55 ` Anthony Liguori
2010-06-09 14:30 ` Paul Brook
2010-06-09 20:47 ` Blue Swirl
2010-06-09 20:52 ` Anthony Liguori
2010-06-09 21:09 ` Blue Swirl
2010-06-09 22:26 ` Paul Brook
2010-06-08 14:04 ` [Qemu-devel] " Anthony Liguori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1275954730-8196-13-git-send-email-aliguori@us.ibm.com \
--to=aliguori@us.ibm.com \
--cc=glommer@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).