diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | fpu/softfloat.c | 10 | ||||
| -rw-r--r-- | hw/virtio/vhost.c | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/Makefile b/Makefile index 727ef118f3..d71dd5bea4 100644 --- a/Makefile +++ b/Makefile @@ -856,7 +856,7 @@ ifneq ($(BLOBS),) $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \ done endif -ifeq ($(CONFIG_GTK),m) +ifdef CONFIG_GTK $(MAKE) -C po $@ endif $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" diff --git a/fpu/softfloat.c b/fpu/softfloat.c index fb8663f59e..d90d79d777 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -1146,6 +1146,11 @@ static FloatParts div_floats(FloatParts a, FloatParts b, float_status *s) a.cls = float_class_dnan; return a; } + /* Inf / x or 0 / x */ + if (a.cls == float_class_inf || a.cls == float_class_zero) { + a.sign = sign; + return a; + } /* Div 0 => Inf */ if (b.cls == float_class_zero) { s->float_exception_flags |= float_flag_divbyzero; @@ -1153,11 +1158,6 @@ static FloatParts div_floats(FloatParts a, FloatParts b, float_status *s) a.sign = sign; return a; } - /* Inf / x or 0 / x */ - if (a.cls == float_class_inf || a.cls == float_class_zero) { - a.sign = sign; - return a; - } /* Div by Inf */ if (b.cls == float_class_inf) { a.cls = float_class_zero; diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index f51bf573d5..9d5850a7d7 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -342,6 +342,10 @@ static int vhost_verify_ring_mappings(struct vhost_dev *dev, "used ring" }; + if (vhost_dev_has_iommu(dev)) { + return 0; + } + for (i = 0; i < dev->nvqs; ++i) { struct vhost_virtqueue *vq = dev->vqs + i; |