On Wed, Oct 30, 2013 at 01:56:38PM +0100, arm...@redhat.com wrote: > From: Markus Armbruster <arm...@redhat.com> > > Currently, we get SeaBIOS defaults: manufacturer Bochs, product Bochs, > no version. Best SeaBIOS can do, but we can provide better defaults: > manufacturer QEMU, product & version taken from QEMUMachine desc and > name. > > This series used to be called "[PATCH v2 0/7] smbios cleanup & nicer > defaults for type 1", but its cleanup parts [0-5/7] already went in. > > Andreas didn't like "[PATCH v2 6/7] vl: Set current_machine early", > and suggested to put he machine into QEMUMachineInitArgs. PATCH 1/2 > does exactly that, replacing v2's PATCH 6/7. PATCH 2/2 is v2's PATCH > 7/7 rebased on top. > > Michael didn't like the way I suppress the nicer defaults for old > machine types via static bool smbios_type1_defaults, and thought it > would be nicer to have it in QEMUMachine or some device. I considered > this, but decided to stick to smbios_type1_defaults, because > > 1. There is no suitable device. > 2. I'd rather not extend QEMUMachine with target-specific stuff. > 3. A static bool whose default value gets flipped by some QEMUMachine > init() methods is what we commonly do in such cases, so let's stick > to that. > > v3: Do it the way Andreas suggested > v2: Rebase, only last patch had conflicts
I picked this up merging 2/2 and 3/2. Unfortunately it';s too late for 1.7 but I'll try to merge it as soon as 1.8 opens. > Markus Armbruster (2): > hw: Pass QEMUMachine to its init() method > smbios: Set system manufacturer, product & version by default > > hw/i386/pc_piix.c | 9 +++++++++ > hw/i386/pc_q35.c | 7 +++++++ > hw/i386/smbios.c | 14 ++++++++++++++ > include/hw/boards.h | 7 +++++-- > include/hw/i386/smbios.h | 2 ++ > vl.c | 3 ++- > 6 files changed, 39 insertions(+), 3 deletions(-) > > -- > 1.8.1.4