|
 |
9bac43 |
From b0c06140414df1c0637c3d06f67e0292c31f967d Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
9bac43 |
Date: Wed, 15 Nov 2017 12:29:20 +0100
|
|
|
9bac43 |
Subject: [PATCH 06/30] q35: Fix mismerge
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
9bac43 |
Message-id: <20171115122920.7207-3-dgilbert@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 77677
|
|
|
9bac43 |
O-Subject: [RHEL-7.5 qemu-kvm-rhev PATCH 2/2] q35: Fix mismerge
|
|
|
9bac43 |
Bugzilla: 1511312
|
|
|
9bac43 |
RH-Acked-by: Marcel Apfelbaum <marcel@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
There's a mismerged line calling SET_MACHINE_COMPAT for the
|
|
|
9bac43 |
RHEL macro in the base pc_q35_machine_option that's ifdef'd
|
|
|
9bac43 |
out, it's correctly called later in pc_q35_machine_rhel7_options.
|
|
|
9bac43 |
|
|
|
9bac43 |
Clean it up (should be no effect).
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
hw/i386/pc_q35.c | 1 -
|
|
|
9bac43 |
1 file changed, 1 deletion(-)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
|
|
|
9bac43 |
index 27c85c5..0818a96 100644
|
|
|
9bac43 |
--- a/hw/i386/pc_q35.c
|
|
|
9bac43 |
+++ b/hw/i386/pc_q35.c
|
|
|
9bac43 |
@@ -301,7 +301,6 @@ static void pc_q35_machine_options(MachineClass *m)
|
|
|
9bac43 |
m->no_floppy = 1;
|
|
|
9bac43 |
m->has_dynamic_sysbus = true;
|
|
|
9bac43 |
m->max_cpus = 288;
|
|
|
9bac43 |
- SET_MACHINE_COMPAT(m, PC_RHEL_COMPAT);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
static void pc_q35_2_10_machine_options(MachineClass *m)
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|