Merge commit 'fc5d642fcae392bbc9fed9ac6bc78ac29ed48372' into upstream-merge

* commit 'fc5d642fcae392bbc9fed9ac6bc78ac29ed48372':
  Fix broken build
  slirp: Use monotonic clock if available (v2)
  slirp: Remove UDP protocol emulation (talk, cuseeme)
  qemu: msix nit: clear msix_entries_nr on error

Fix build failure in on_vcpu()

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 1 insertions, 0 deletions

diff --git a/hw/msix.c b/hw/msix.c
index b5dfa0bb7..974268d33 100644
--- a/hw/msix.c
+++ b/hw/msix.c
@@ -373,6 +373,7 @@ int msix_init(struct PCIDevice *dev, unsigned short nentries,
     return 0;
 
 err_config:
+    dev->msix_entries_nr = 0;
     cpu_unregister_io_memory(dev->msix_mmio_index);
 err_index:
     qemu_free(dev->msix_table_page);