From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Richard Henderson <rth@twiddle.net>,
Eduardo Habkost <ehabkost@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: [Qemu-devel] [PULL 2/9] pc: Don't set hw_version on pc-*-2.5
Date: Thu, 26 Nov 2015 18:44:07 +0200 [thread overview]
Message-ID: <1448556198-25213-3-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1448556198-25213-1-git-send-email-mst@redhat.com>
From: Eduardo Habkost <ehabkost@redhat.com>
Now that qemu_hw_version() returns a fixed "2.5+" string instead
of QEMU_VERSION, we don't need to set hw_version on pc-*-2.5
explicitly.
Suggested-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/i386/pc_piix.c | 1 -
hw/i386/pc_q35.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 07d0baa..2e41efe 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -472,7 +472,6 @@ static void pc_i440fx_machine_options(MachineClass *m)
static void pc_i440fx_2_5_machine_options(MachineClass *m)
{
pc_i440fx_machine_options(m);
- m->hw_version = QEMU_VERSION;
m->alias = "pc";
m->is_default = 1;
}
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 0fdae09..133bc68 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -373,7 +373,6 @@ static void pc_q35_machine_options(MachineClass *m)
static void pc_q35_2_5_machine_options(MachineClass *m)
{
pc_q35_machine_options(m);
- m->hw_version = QEMU_VERSION;
m->alias = "q35";
}
--
MST
next prev parent reply other threads:[~2015-11-26 16:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-26 16:43 [Qemu-devel] [PULL 0/9] vhost, pc: fixes for 2.5 Michael S. Tsirkin
2015-11-26 16:44 ` [Qemu-devel] [PULL 1/9] osdep: Change default value of qemu_hw_version() to "2.5+" Michael S. Tsirkin
2015-11-26 16:44 ` Michael S. Tsirkin [this message]
2015-11-26 16:44 ` [Qemu-devel] [PULL 3/9] vhost-user: set link down when the char device is closed Michael S. Tsirkin
2015-11-26 16:44 ` [Qemu-devel] [PULL 4/9] vhost-user: clarify start and enable Michael S. Tsirkin
2015-11-26 16:44 ` [Qemu-devel] [PULL 5/9] tests/vhost-user-bridge: propose GUEST_ANNOUNCE feature Michael S. Tsirkin
2015-11-26 16:44 ` [Qemu-devel] [PULL 6/9] tests/vhost-user-bridge: read command line arguments Michael S. Tsirkin
2015-11-26 16:44 ` [Qemu-devel] [PULL 7/9] Revert "vhost: send SET_VRING_ENABLE at start/stop" Michael S. Tsirkin
2015-11-26 16:44 ` [Qemu-devel] [PULL 8/9] Fix memory leak on error Michael S. Tsirkin
2015-11-26 16:44 ` [Qemu-devel] [PULL 9/9] vhost-user-test: fix migration overlap test Michael S. Tsirkin
2015-11-26 17:39 ` [Qemu-devel] [PULL 0/9] vhost, pc: fixes for 2.5 Peter Maydell
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=1448556198-25213-3-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=ehabkost@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/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).