search for: 386,6

...drivers/virtio/virtio_balloon.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 5b15936a5214..625caac35264 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -386,6 +386,17 @@ static void stats_handle_request(struct virtio_balloon *vb) virtqueue_kick(vq); } +static inline s64 align_pages_up(s64 diff) +{ + if (diff == 0) + return diff; + + if (diff > 0) + return ALIGN(diff, VIRTIO_BALLOON_PAGES_PER_PAGE); + + return -ALIGN(-diff, VIRTIO_BALLOON_PAGE...

...err_buf: dev->stats.rx_dropped++; dev_kfree_skb(head_skb); while (--num_buf) { - buf = virtqueue_get_buf(rq->vq, &len); + buf = rq_get_buf(rq, &len); if (unlikely(!buf)) { pr_debug("%s: rx error: %d buffers missing\n", dev->name, num_buf); @@ -379,7 +386,6 @@ err_buf: } page = virt_to_head_page(buf); put_page(page); - --rq->num; } return NULL; } @@ -675,9 +681,8 @@ static int virtnet_poll(struct napi_struct *napi, int budget) again: while (received < budget && - (buf = virtqueue_get_buf(rq->vq, &len))...

...err_buf: dev->stats.rx_dropped++; dev_kfree_skb(head_skb); while (--num_buf) { - buf = virtqueue_get_buf(rq->vq, &len); + buf = rq_get_buf(rq, &len); if (unlikely(!buf)) { pr_debug("%s: rx error: %d buffers missing\n", dev->name, num_buf); @@ -379,7 +386,6 @@ err_buf: } page = virt_to_head_page(buf); put_page(page); - --rq->num; } return NULL; } @@ -675,9 +681,8 @@ static int virtnet_poll(struct napi_struct *napi, int budget) again: while (received < budget && - (buf = virtqueue_get_buf(rq->vq, &len))...

...++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c > index 5b15936a5214..625caac35264 100644 > --- a/drivers/virtio/virtio_balloon.c > +++ b/drivers/virtio/virtio_balloon.c > @@ -386,6 +386,17 @@ static void stats_handle_request(struct virtio_balloon *vb) > virtqueue_kick(vq); > } > > +static inline s64 align_pages_up(s64 diff) > +{ > + if (diff == 0) > + return diff; > + > + if (diff > 0) > + return ALIGN(diff, VIRTIO_BALLOON_PAGES_PE...

...); +static char *map_registry_disk_blob_gpt(guestfs_h *g, const void *blob); +static char *extract_guid_from_registry_blob(guestfs_h *g, const void *blob); /* XXX Handling of boot.ini in the Perl version was pretty broken. It * essentially didn't do anything for modern Windows guests. @@ -386,6 +389,7 @@ check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs) int r; size_t len = strlen (fs->windows_systemroot) + 64; char system[len]; + char gpt_prefix[] = "DMIO:ID:"; snprintf (system, len, "%s/system32/config/system", fs->w...

...unlink_on_exit, but recursively cleaning directories. --- mllib/common_utils.ml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/mllib/common_utils.ml b/mllib/common_utils.ml index 3943417..f49ede6 100644 --- a/mllib/common_utils.ml +++ b/mllib/common_utils.ml @@ -386,6 +386,35 @@ let unlink_on_exit = registered_handlers := true ) +(* Remove a temporary directory on exit. *) +let rmdir_on_exit = + let dirs = ref [] in + let registered_handlers = ref false in + + let rec unlink_dirs () = + let rec recursive_rmdir fn = + if Sys.is_director...

...+static char *map_registry_disk_blob_gpt (guestfs_h *g, const void *blob); +static char *extract_guid_from_registry_blob (guestfs_h *g, const void *blob); /* XXX Handling of boot.ini in the Perl version was pretty broken. It * essentially didn't do anything for modern Windows guests. @@ -386,6 +389,7 @@ check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs) int r; size_t len = strlen (fs->windows_systemroot) + 64; char system[len]; + char gpt_prefix[] = "DMIO:ID:"; snprintf (system, len, "%s/system32/config/system", fs->w...

...; > --- > drivers/virtio/virtio_vdpa.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/virtio/virtio_vdpa.c b/drivers/virtio/virtio_vdpa.c > index c30eb55..1e8acb9 100644 > --- a/drivers/virtio/virtio_vdpa.c > +++ b/drivers/virtio/virtio_vdpa.c > @@ -386,6 +386,8 @@ static void virtio_vdpa_remove(struct vdpa_device *vdpa) > }, > .probe = virtio_vdpa_probe, > .remove = virtio_vdpa_remove, > + .setup_vq_irq = NULL, > + .unsetup_vq_irq = NULL, > }; Is this really needed consider the it's static? Thanks > &gt...

...file changed, 2 insertions(+) >>> >>> diff --git a/drivers/virtio/virtio_vdpa.c >>> b/drivers/virtio/virtio_vdpa.c >>> index c30eb55..1e8acb9 100644 >>> --- a/drivers/virtio/virtio_vdpa.c >>> +++ b/drivers/virtio/virtio_vdpa.c >>> @@ -386,6 +386,8 @@ static void virtio_vdpa_remove(struct >>> vdpa_device *vdpa) >>> ????? }, >>> ????? .probe??? = virtio_vdpa_probe, >>> ????? .remove = virtio_vdpa_remove, >>> +??? .setup_vq_irq = NULL, >>> +??? .unsetup_vq_irq = NULL, >>>...

...MIN (count, maxlen), + ROUND_DOWN (offset, minblock), + flags, extents, err); +} + static struct nbdkit_filter filter = { .name = "blocksize", .longname = "nbdkit blocksize filter", @@ -386,6 +404,7 @@ static struct nbdkit_filter filter = { .pwrite = blocksize_pwrite, .trim = blocksize_trim, .zero = blocksize_zero, + .extents = blocksize_extents, }; NBDKIT_REGISTER_FILTER(filter) -- 2.20.1

...rm/nouveau/nouveau_state.c | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c index 186f34b..8f3a12f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mem.c +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c @@ -386,7 +386,6 @@ void nouveau_mem_close(struct drm_device *dev) nouveau_bo_unpin(dev_priv->vga_ram); nouveau_bo_ref(NULL, &dev_priv->vga_ram); - ttm_bo_clean_mm(&dev_priv->ttm.bdev, TTM_PL_VRAM); ttm_bo_device_release(&dev_priv->ttm.bdev); nouveau_ttm_global_release(d...

...to /arch.cmd in the rootfs. This implements that functionality for sparc32; the code is identical to sparc64 minus the openprom support for obtaining nfsroot options. Signed-off-by: H. Peter Anvin <hpa at zytor.com> --- commit fc8c0c09f9dd5139dd8d797eaf9fe33962b6cd2c tree ee9f637f9b8be2032386ae4097505e8583b960b4 parent c6e5c5a77681f5bf6f9fea55d031115e9f58ada6 author H. Peter Anvin <hpa at zytor.com> Thu, 25 May 2006 22:34:47 -0700 committer H. Peter Anvin <hpa at zytor.com> Sun, 18 Jun 2006 18:56:23 -0700 arch/sparc/kernel/setup.c | 47 +++++++++++++++++++++++++++++++++++...

...d-off-by: Michael S. Tsirkin <mst at redhat.com> --- hw/pci.c | 53 +++++++++++++++++++++++++++++++++++------------------ hw/pci.h | 2 ++ 2 files changed, 37 insertions(+), 18 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index e3f80d0..aa88a0b 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -386,6 +386,40 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num, *(uint32_t *)(pci_dev->wmask + addr) = cpu_to_le32(wmask); } +static void pci_unmap_region(PCIDevice *d, PCIIORegion *r) +{ + if (r->addr == -1) + return; + if (r->type & PCI_ADDRESS_SPACE_IO) {...

...d-off-by: Michael S. Tsirkin <mst at redhat.com> --- hw/pci.c | 53 +++++++++++++++++++++++++++++++++++------------------ hw/pci.h | 2 ++ 2 files changed, 37 insertions(+), 18 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index e3f80d0..aa88a0b 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -386,6 +386,40 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num, *(uint32_t *)(pci_dev->wmask + addr) = cpu_to_le32(wmask); } +static void pci_unmap_region(PCIDevice *d, PCIIORegion *r) +{ + if (r->addr == -1) + return; + if (r->type & PCI_ADDRESS_SPACE_IO) {...

...000000 +0300 +++ xen-4.0.1/tools/pygrub/src/GrubConf.py 2012-07-06 10:55:37.000000000 +0300 @@ -368,6 +368,7 @@ in_function = False img = None title = "" + submenu = 0 for l in lines: l = l.strip() # skip blank lines @@ -386,6 +387,12 @@ in_function = False continue + # new submenu + title_match = re.match('^submenu ["\'](.*)["\'] (.*){', l) + if title_match: + submenu += 1 + continue +...

...2 ++ net/vmw_vsock/virtio_transport.c | 2 ++ net/vmw_vsock/vmci_transport.c | 1 + 6 files changed, 25 insertions(+), 4 deletions(-) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index b235f4bbe8ea..fdda9ec625ad 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -386,6 +386,8 @@ static bool vhost_vsock_more_replies(struct vhost_vsock *vsock) static struct virtio_transport vhost_transport = { .transport = { + .module = THIS_MODULE, + .get_local_cid = vhost_transport_get_local_cid, .init = virtio_tran...

...2 ++ mm/migrate.c | 3 +++ 5 files changed, 16 insertions(+) diff --git a/arch/powerpc/kvm/book3s_hv_uvmem.c b/arch/powerpc/kvm/book3s_hv_uvmem.c index 79b1202b1c62..29ed52892d31 100644 --- a/arch/powerpc/kvm/book3s_hv_uvmem.c +++ b/arch/powerpc/kvm/book3s_hv_uvmem.c @@ -386,6 +386,7 @@ kvmppc_svm_page_in(struct vm_area_struct *vma, unsigned long start, mig.end = end; mig.src = &src_pfn; mig.dst = &dst_pfn; + mig.dev_private_owner = &kvmppc_uvmem_pgmap; /* * We come here with mmap_sem write lock held just for @@ -563,6 +564,7 @@ kvmppc_svm_page...

...644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -28,6 +28,7 @@ #include <xen/softirq.h> #include <xen/list.h> #include <xen/device_tree.h> +#include <xen/keyhandler.h> #include <asm/p2m.h> #include <asm/domain.h> #include <asm/platform.h> @@ -386,6 +387,77 @@ int gic_irq_xlate(const u32 *intspec, unsigned int intsize, return 0; } + +static void do_dump_gic(unsigned char key) +{ + int irq; + printk("''%c'' pressed -> dumping GIC state\n", key); + + for ( irq = 0; irq < gic.lines; irq++ ) +...

...le.am @@ -32,6 +32,7 @@ EXTRA_DIST = \ test-simplestreams/streams/v1/net.cirros-cloud_released_download.json \ test-virt-builder.sh \ test-docs.sh \ + test-virt-builder-cacheall.sh \ test-virt-builder-list.sh \ test-virt-builder-list-simplestreams.sh \ test-virt-builder-planner.sh \ @@ -386,6 +387,7 @@ index_parser_tests_LINK = \ TESTS = \ test-docs.sh \ + test-virt-builder-cacheall.sh \ test-virt-builder-list.sh \ test-virt-index-validate.sh \ $(SLOW_TESTS) diff --git a/builder/builder.ml b/builder/builder.ml index 41c0a4ccc..c84352fec 100644 --- a/builder/builder.ml +++ b...

.../* acpi=off: ACPI is slow, 150-200ms on my laptop */ " printk.time=1" /* display timestamp before kernel messages */ " cgroup_disable=memory" /* saves us about 5 MB of RAM */ " usbcore.nousb" /* disable USB, only saves about 1ms */ @@ -386,6 +391,7 @@ guestfs_int_appliance_command_line (guestfs_h *g, const char *appliance_dev, g->memsize, #endif lpj_s, + !use_acpi ? " acpi=off" : "", root, g->selinux ? "selinux=1 enforcing=0" : "selinux=0", g->verbose...