From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52433) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4STx-0004Xz-52 for qemu-devel@nongnu.org; Wed, 31 Jul 2013 05:14:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V4STo-0006xE-Hw for qemu-devel@nongnu.org; Wed, 31 Jul 2013 05:14:09 -0400 Received: from mail-ea0-x235.google.com ([2a00:1450:4013:c01::235]:38613) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4RYS-0003vz-KQ for qemu-devel@nongnu.org; Wed, 31 Jul 2013 04:14:44 -0400 Received: by mail-ea0-f181.google.com with SMTP id d10so185674eaj.26 for ; Wed, 31 Jul 2013 01:14:43 -0700 (PDT) From: Vincenzo Maffione Date: Wed, 31 Jul 2013 10:13:50 +0200 Message-Id: <1375258430-2120-3-git-send-email-v.maffione@gmail.com> In-Reply-To: <1375258430-2120-1-git-send-email-v.maffione@gmail.com> References: <1375258430-2120-1-git-send-email-v.maffione@gmail.com> Subject: [Qemu-devel] [PATCH v5 2/2] i386/pc: introducing compat_props for pc-1.6 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, mst@redhat.com, rizzo@iet.unipi.it, jasowang@redhat.com, Vincenzo Maffione , stefanha@redhat.com, pbonzini@redhat.com, g.lettieri@iet.unipi.it, lersek@redhat.com, afaerber@suse.de PC_COMPAT_1_6 macro introduced in order to set the e1000 "mitigation" property off for pc-i440fx-1.6 and pc-q35-1.6 machines. Signed-off-by: Vincenzo Maffione --- hw/i386/pc_piix.c | 4 ++++ hw/i386/pc_q35.c | 4 ++++ include/hw/i386/pc.h | 7 +++++++ 3 files changed, 15 insertions(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ab25458..f039377 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -343,6 +343,10 @@ static QEMUMachine pc_i440fx_machine_v1_6 = { .init = pc_init_pci, .hot_add_cpu = pc_hot_add_cpu, .max_cpus = 255, + .compat_props = (GlobalProperty[]) { + PC_COMPAT_1_6, + { /* end of list */ } + }, .is_default = 1, DEFAULT_MACHINE_OPTIONS, }; diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 2f35d12..807b9ef 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -237,6 +237,10 @@ static QEMUMachine pc_q35_machine_v1_6 = { .init = pc_q35_init, .hot_add_cpu = pc_hot_add_cpu, .max_cpus = 255, + .compat_props = (GlobalProperty[]) { + PC_COMPAT_1_6, + { /* end of list */ } + }, DEFAULT_MACHINE_OPTIONS, }; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 3a0c4e3..812df4d 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -214,6 +214,13 @@ void pvpanic_init(ISABus *bus); int e820_add_entry(uint64_t, uint64_t, uint32_t); +#define PC_COMPAT_1_6 \ + {\ + .driver = "e1000",\ + .property = "mitigation",\ + .value = "off",\ + } + #define PC_COMPAT_1_5 \ {\ .driver = "Conroe-" TYPE_X86_CPU,\ -- 1.8.3.4