| commit | 1fb6752ecf87fb132035d3c03b0b9ca012265492 | |
| author | Eduardo Habkost <ehabkost@redhat.com> | |
| Fri, 8 Jun 2018 19:29:40 +0000 (8 16:29 -0300) | ||
| committer | Eduardo Habkost <ehabkost@redhat.com> | |
| Mon, 11 Jun 2018 00:33:00 +0000 (10 21:33 -0300) | ||
| tree | 30da4cf1cf93ef3e80440d63a1adc5b77c23ded7 | treesnapshot (tar.gz zip) |
| parent | 8f4202fb1080f86958782b1fca0bf0279f67d136 | commitdiff |
pc: Remove PC_COMPAT_2_12 from 3.0 machine-types
commit f548222c added PC_COMPAT_2_12 to the 3.0 PC machine-types.
I believe this happened during manual conflict resolution when
applying the patch.
Cc: Xiao Guangrong <xiaoguangrong@tencent.com>
Cc: Juan Quintela <quintela@redhat.com>
Fixes: f548222c24342ca74689de7794f9006b43f86a54
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608192940.19548-1-ehabkost@redhat.com>
Reviewed-by: Marcel Apfelbaum<marcel.apfelbaum@gmail.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
commit f548222c added PC_COMPAT_2_12 to the 3.0 PC machine-types.
I believe this happened during manual conflict resolution when
applying the patch.
Cc: Xiao Guangrong <xiaoguangrong@tencent.com>
Cc: Juan Quintela <quintela@redhat.com>
Fixes: f548222c24342ca74689de7794f9006b43f86a54
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608192940.19548-1-ehabkost@redhat.com>
Reviewed-by: Marcel Apfelbaum<marcel.apfelbaum@gmail.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| hw/i386/pc_piix.c | diffblobblamehistory | |
| hw/i386/pc_q35.c | diffblobblamehistory |