From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9cRT-0006Gh-Es for qemu-devel@nongnu.org; Thu, 17 Dec 2015 12:34:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9cRP-0003Dp-DT for qemu-devel@nongnu.org; Thu, 17 Dec 2015 12:34:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48882) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9cRP-0003Dk-6r for qemu-devel@nongnu.org; Thu, 17 Dec 2015 12:34:11 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id D583832D3DE for ; Thu, 17 Dec 2015 17:34:10 +0000 (UTC) From: Marcel Apfelbaum Date: Thu, 17 Dec 2015 19:34:07 +0200 Message-Id: <1450373647-20699-1-git-send-email-marcel@redhat.com> Subject: [Qemu-devel] [PATCH] hw/q35: fix pc-q35-1.6 machine options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: marcel@redhat.com, pbonzini@redhat.com, ehabkost@redhat.com, mst@redhat.com Following the convention each machine_options function should call the next machine options first. Signed-off-by: Marcel Apfelbaum --- This is of course not needed if Eduardo's "q35: Remove old machine versions" gets accepted. hw/i386/pc_q35.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 9a12068..c92c4a1 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -455,7 +455,7 @@ DEFINE_Q35_MACHINE(v1_7, "pc-q35-1.7", pc_compat_1_7, static void pc_q35_1_6_machine_options(MachineClass *m) { - pc_q35_machine_options(m); + pc_q35_1_7_machine_options(m); m->hw_version = "1.6.0"; SET_MACHINE_COMPAT(m, PC_COMPAT_1_6); } -- 2.4.3