search for: 306,6

...is affects -o rhev and -o vdsm. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/create_ovf.ml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml index f5dc64753..9d7341696 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -306,6 +306,12 @@ let rec create_ovf source targets guestcaps inspect e "DefaultDisplayType" [] [PCData "1"]; ] in + (match source.s_cpu_model with + | None -> () + | Some model -> + push_back content_subnodes (e "CustomCpuNam...

...) diff --git a/fish/Makefile.am b/fish/Makefile.am index fc7c729..5ffa0f1 100644 --- a/fish/Makefile.am +++ b/fish/Makefile.am @@ -297,7 +297,6 @@ TESTS += \ test-find0.sh \ test-inspect.sh \ test-glob.sh \ - test-mount-local.sh \ test-prep.sh \ test-read-file.sh \ test-remote.sh \ @@ -306,6 +305,11 @@ TESTS += \ test-run.sh \ test-stringlist.sh \ test-upload-to-dir.sh + +if HAVE_FUSE +TESTS += \ + test-mount-local.sh +endif endif check-valgrind: diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index b3ad3c3..50eda8f 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Make...

...gt; drivers/vhost/vhost.c | 22 ++++++++++++++++------ > 1 file changed, 16 insertions(+), 6 deletions(-) > > diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c > index 89c9f08b5146..5b8821d00fe4 100644 > --- a/drivers/vhost/vhost.c > +++ b/drivers/vhost/vhost.c > @@ -306,6 +306,18 @@ static void vhost_map_unprefetch(struct vhost_map *map) > kfree(map); > } > > +static void vhost_set_map_dirty(struct vhost_virtqueue *vq, > + struct vhost_map *map, int index) > +{ > + struct vhost_uaddr *uaddr = &vq->uaddrs[index]; > + int i; &g...

...gt; drivers/vhost/vhost.c | 22 ++++++++++++++++------ > 1 file changed, 16 insertions(+), 6 deletions(-) > > diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c > index 89c9f08b5146..5b8821d00fe4 100644 > --- a/drivers/vhost/vhost.c > +++ b/drivers/vhost/vhost.c > @@ -306,6 +306,18 @@ static void vhost_map_unprefetch(struct vhost_map *map) > kfree(map); > } > > +static void vhost_set_map_dirty(struct vhost_virtqueue *vq, > + struct vhost_map *map, int index) > +{ > + struct vhost_uaddr *uaddr = &vq->uaddrs[index]; > + int i; &g...

...@@ /* febootstrap-supermin-helper reimplementation in C. - * Copyright (C) 2009-2010 Red Hat Inc. + * Copyright (C) 2009-2010, 2012 Red Hat Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -306,6 +306,7 @@ load_file (const char *filename) line[len-1] = '\0'; add_string (&lines, &n_used, &n_alloc, line); } + fclose (fp); add_string (&lines, &n_used, &n_alloc, NULL); return lines; -- 1.7.9.rc0.13.gbee72 >From f03d46334bb318fad7a7b7...

...h/arm/p2m.c index 307c6d4..e3dfbd7 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -3,6 +3,7 @@ #include <xen/lib.h> #include <xen/errno.h> #include <xen/domain_page.h> +#include <xen/bitops.h> #include <asm/flushtlb.h> #include <asm/gic.h> @@ -306,6 +307,46 @@ int p2m_alloc_table(struct domain *d) return 0; } +#define MAX_VMID 256 + +/* VTTBR_EL2 VMID field is 8 bits. Using a bitmap here limits us to + * 256 concurrent domains. */ +DECLARE_BITMAP(vmid_mask, MAX_VMID); + +void p2m_vmid_allocator_init(void) +{ + /* VMID 0 is reserve...

...ang <jasowang at redhat.com> --- drivers/vhost/vhost.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 89c9f08b5146..5b8821d00fe4 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -306,6 +306,18 @@ static void vhost_map_unprefetch(struct vhost_map *map) kfree(map); } +static void vhost_set_map_dirty(struct vhost_virtqueue *vq, + struct vhost_map *map, int index) +{ + struct vhost_uaddr *uaddr = &vq->uaddrs[index]; + int i; + + if (uaddr->write) { + for (i = 0;...

...22 ++++++++++++++++------ >> 1 file changed, 16 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c >> index 89c9f08b5146..5b8821d00fe4 100644 >> --- a/drivers/vhost/vhost.c >> +++ b/drivers/vhost/vhost.c >> @@ -306,6 +306,18 @@ static void vhost_map_unprefetch(struct vhost_map *map) >> kfree(map); >> } >> >> +static void vhost_set_map_dirty(struct vhost_virtqueue *vq, >> + struct vhost_map *map, int index) >> +{ >> + struct vhost_uaddr *uaddr = &vq->...

hvm: clear vmxe if vmxoff The current Xen code keeps X86_CR4_VMXE set even if VMXON has not been executed. The stop_vmx() code assumes that it is possible to call VMXOFF if X86_CR4_VMXE is set which is not always true. Calling VMXOFF without VMXON results in an illegal opcode trap, and to avoid this condition this patch makes sure that X86_CR4_VMXE is only set when VMXON has been called.

...+ netif_exit_accel(); + return xenbus_unregister_driver(&netfront); } module_exit(netif_exit); diff -r fdfd708d2ec4 drivers/xen/netfront/netfront.h --- a/drivers/xen/netfront/netfront.h Wed Oct 24 15:38:35 2007 +0100 +++ b/drivers/xen/netfront/netfront.h Wed Oct 24 16:11:32 2007 +0100 @@ -306,6 +306,8 @@ int netfront_load_accelerator(struct net extern void netif_init_accel(void); +extern +void netif_exit_accel(void); extern void init_accelerator_vif(struct netfront_info *np, _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com h...

..._string() : --- src/ulogd.c 2016-12-17 16:25:45.000000000 +0100 +++ src/ulogd.c 2017-10-02 18:01:26.413740164 +0200 @@ -188,6 +188,7 @@ ret = 8; break; case ULOGD_RET_IP6ADDR: + case ULOGD_RET_RAWSTR: ret = 16; break; case ULOGD_RET_STRING: @@ -306,6 +307,9 @@ case ULOGD_RET_RAW: return strdup("raw data"); break; + case ULOGD_RET_RAWSTR: + return strdup("raw string"); + break; default: return strdup("Unknown type"); } --...

...ex == 1) { + requested_features &= ~(1 << (VIRTIO_F_VERSION_1 - 32)); + } return requested_features; } diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 5af17e2..bd52845 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -306,6 +306,9 @@ static void virtio_balloon_set_config(VirtIODevice *vdev, static uint32_t virtio_balloon_get_features(VirtIODevice *vdev, unsigned int index, uint32_t f) { + if (index == 1) { + f &= ~(1 << (VIRTIO_F_VERSION_1 - 32)); +...

...ex == 1) { + requested_features &= ~(1 << (VIRTIO_F_VERSION_1 - 32)); + } return requested_features; } diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 5af17e2..bd52845 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -306,6 +306,9 @@ static void virtio_balloon_set_config(VirtIODevice *vdev, static uint32_t virtio_balloon_get_features(VirtIODevice *vdev, unsigned int index, uint32_t f) { + if (index == 1) { + f &= ~(1 << (VIRTIO_F_VERSION_1 - 32)); +...

...rio_done_work(struct work_struct *work) while ((req = virtqueue_get_buf(vq, &len)) != NULL) { kfree(req); - fsvq->in_flight--; + dec_in_flight_req(fsvq); } } while (!virtqueue_enable_cb(vq) && likely(!virtqueue_is_broken(vq))); spin_unlock(&fsvq->lock); @@ -306,6 +300,7 @@ static void virtio_fs_hiprio_dispatch_work(struct work_struct *work) list_del(&forget->list); if (!fsvq->connected) { + dec_in_flight_req(fsvq); spin_unlock(&fsvq->lock); kfree(forget); continue; @@ -327,13 +322,13 @@ static void virtio_fs_hiprio_d...

...g-setup.d/"10_Set Hostname" %{__ln_s} ../..%{_sbindir}/ovirt-config-networking %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"15_Networking Setup" %{__ln_s} ../..%{_sbindir}/ovirt-config-logging %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"30_Logging Setup" @@ -306,6 +308,7 @@ fi %{_sbindir}/ovirt-config-boot %{_sbindir}/ovirt-config-boot-wrapper %{_sbindir}/ovirt-config-collectd +%{_sbindir}/ovirt-config-enable-ssh %{_sbindir}/ovirt-config-hostname %{_sbindir}/ovirt-config-logging %{_sbindir}/ovirt-config-networking diff --git a/scripts/ovirt-config-en...

..., desc_block); + return p + sbi->s_desc_size * desc_index; +} + +/* + * get the group's descriptor of group_num + */ +static inline const struct ext2_group_desc * +ext2_get_group_desc(struct fs_info *fs, uint32_t group_num) +{ + return __ext2_get_group_desc(fs, group_num); } /* @@ -306,6 +310,7 @@ static int ext2_fs_init(struct fs_info *fs) if (sb.s_desc_size < sizeof(struct ext2_group_desc)) sb.s_desc_size = sizeof(struct ext2_group_desc); sbi->s_desc_per_block = BLOCK_SIZE(fs) / sb.s_desc_size; + sbi->s_desc_size = sb.s_desc_size; sbi->s_groups...

...cmd->cb.fn.chunk.callback) { int scratch = error; - uint16_t flags = be16toh (h->sbuf.sr.structured_reply.flags); /* Different from successful reads: inform the callback about the * current error rather than any earlier one. If the callback fails @@ -307,8 +306,6 @@ &scratch) == -1) if (cmd->error == 0) cmd->error = scratch; - if (flags & NBD_REPLY_FLAG_DONE) - FREE_CALLBACK (cmd->cb.fn.chunk); } } @@ -390,15 +387,12 @@ assert (cmd); /* guaranteed by CHE...

...--------------- 4 files changed, 13 insertions(+), 55 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c index 25503b9335..14a13edc02 100644 --- a/drivers/gpu/drm/virtio/virtgpu_display.c +++ b/drivers/gpu/drm/virtio/virtgpu_display.c @@ -306,6 +306,10 @@ virtio_gpu_user_framebuffer_create(struct drm_device *dev, struct virtio_gpu_framebuffer *virtio_gpu_fb; int ret; + if (mode_cmd->pixel_format != DRM_FORMAT_HOST_XRGB8888 && + mode_cmd->pixel_format != DRM_FORMAT_HOST_ARGB8888) + return ERR_PTR(-ENOENT); + /*...

...@@ struct thread_struct { set_fs(USER_DS); \ } while(0) +#ifdef CONFIG_PARAVIRT +#include <asm/paravirt.h> +#else +#define paravirt_enabled() 0 #define get_debugreg(var, register) \ __asm__("movq %%db" #register ", %0" \ :"=r" (var)) @@ -306,6 +281,31 @@ struct thread_struct { __asm__("movq %0,%%db" #register \ : /* no output */ \ :"r" (value)) +#define load_rsp0(tss, thread) \ + do { (tss)->rsp0 = (thread)->rsp0; } while(0) +#endif + +/* + * Save the cr4 feature set we're using (ie + * Pe...

...@@ struct thread_struct { set_fs(USER_DS); \ } while(0) +#ifdef CONFIG_PARAVIRT +#include <asm/paravirt.h> +#else +#define paravirt_enabled() 0 #define get_debugreg(var, register) \ __asm__("movq %%db" #register ", %0" \ :"=r" (var)) @@ -306,6 +281,31 @@ struct thread_struct { __asm__("movq %0,%%db" #register \ : /* no output */ \ :"r" (value)) +#define load_rsp0(tss, thread) \ + do { (tss)->rsp0 = (thread)->rsp0; } while(0) +#endif + +/* + * Save the cr4 feature set we're using (ie + * Pe...