Merge remote-tracking branch 'mst/tags/for_anthony' into staging

pc,pci,virtio fixes and cleanups

This includes pc and pci cleanups and enhancements,
and a virtio-net bugfix related to softmac programming.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Sun 29 Sep 2013 01:51:16 AM CDT using RSA key ID D28D5469
# gpg: Can't check signature: public key not found

# By Michael S. Tsirkin (8) and others
# Via Michael S. Tsirkin
* mst/tags/for_anthony:
  smbios: Factor out smbios_maybe_add_str()
  smbios: Make multiple -smbios type= accumulate sanely
  smbios: Improve diagnostics for conflicting entries
  smbios: Convert to QemuOpts
  smbios: Normalize smbios_entry_add()'s error handling to exit(1)
  virtio-net: fix up HMP NIC info string on reset
  pci: remove explicit check to 64K ioport size
  piix4: disable io on reset
  piix: use 64 bit window programmed by guest
  q35: use 64 bit window programmed by guest
  pci: add helper to retrieve the 64-bit range
  range: add min/max operations on ranges
  range: add Range to typedefs
  q35: make pci window address/size match guest cfg

Message-id: 1380437951-21788-1-git-send-email-mst@redhat.com

diff --cc arch_init.c
Simple merge

diff --cc hw/pci-host/q35.c
Simple merge

diff --cc include/sysemu/sysemu.h
index ffc53aa848afdf1d2d46e602cd193e5d43f4d0fc,42577363ca304de11d100457273ad760bac29616..cd5791eb74df05f296df4fb479d0c873dc69a70b
--- 1/include/sysemu/sysemu.h
--- 2/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@@ -16,10 -16,9 +16,11 @@@ extern const char *bios_name
  
  extern const char *qemu_name;
  extern uint8_t qemu_uuid[];
+ extern bool qemu_uuid_set;
  int qemu_uuid_parse(const char *str, uint8_t *uuid);
 +
  #define UUID_FMT "%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx"
 +#define UUID_NONE "00000000-0000-0000-0000-000000000000"
  
  bool runstate_check(RunState state);
  void runstate_set(RunState new_state);

diff --cc vl.c
Simple merge