Il 19/02/2013 23:59, Cole Robinson ha scritto: > On 02/19/2013 05:52 PM, Paolo Bonzini wrote: >> Il 19/02/2013 23:40, Cole Robinson ha scritto: >>> +#ifdef CONFIG_MIGRATE_FROM_QEMU_KVM >>> +/* qemu-kvm defaulted to 16MB video memory since 0.15 at least. */ >>> +# define OLD_VGA_MEM stringify(16) >>> +#else >>> +# define OLD_VGA_MEM stringify(8) >>> +#endif >>> + >>> #define PC_COMPAT_1_2 \ >>> PC_COMPAT_1_3,\ >>> {\ >>> @@ -354,6 +361,10 @@ static QEMUMachine pc_machine_v1_3 = { >>> .property = "revision",\ >>> .value = stringify(3),\ >>> },{\ >>> + .driver = "cirrus-vga",\ >>> + .property = "vgamem_mb",\ >>> + .value = OLD_VGA_MEM,\ >>> + },{\ >>> .driver = "VGA",\ >>> .property = "mmio",\ >>> .value = "off",\ >> >> Because this is now 1.5, you also need to define pc_machine_v1_4 and add >> the compat property there. > > I'm confused, pc-1.4 cirrus has vgamem_mb=8, and we want it that way > regardless of whether --enable-migration-from-qemu-kvm is specified. > > (this patch doesn't change the default cirrus memory as you suggested in the > referenced mail)
Yes, that's it. Better go to bed. That would be a separate patch that wouldn't have to be Cc-ed to stable. Paolo >> Also, please add the "Cc: qemu-sta...@nongnu.org" in the body of the >> message. It's an easy way for maintainers to pick up patches only after >> they've been committed. >> > > Will do if/when reposting. > > Thanks, > Cole > >