Am 11.08.2013 17:10, schrieb Marcel Apfelbaum: > This patch is based on Hu Tao's: > http://lists.nongnu.org/archive/html/qemu-devel/2013-08/msg00124.html > > No need to hard-code pvpanic as part of the machine. > It can be added with "-device pvpanic" from command line (The next patch). > Anyway, for backport compatibility it is still part of 1.5 > machine. > > Signed-off-by: Marcel Apfelbaum <marce...@redhat.com> > --- > Changes from v1: > - Keep pvpanic device enabled by default for 1.5 > for backport compatibility > > hw/i386/pc_piix.c | 9 ++++----- > hw/i386/pc_q35.c | 7 ++++--- > 2 files changed, 8 insertions(+), 8 deletions(-)
Reviewed-by: Andreas Färber <afaer...@suse.de> Anthony, note that my pending CPU pull adds a line to the two _1_4 functions, so that they trivially conflict. Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg