search for: 213,10

...ssary lines to the end of the anyterm sysconf --- scripts/ovirt-functions | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index af3a257..98e88e7 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -213,11 +213,10 @@ ovirt_setup_libvirtd() { ovirt_setup_anyterm() { # configure anyterm - sed -i -e 's/^# ANYTERM_CMD=\/usr\/bin\/anyterm-cmd/ANYTERM_CMD="sudo \/usr\/bin\/virsh console %p"/' \ - /etc/sysconfig/anyterm - - sed -i -e 's/^# ANYTERM_LOCAL_ONLY=true/A...

...v/fb/ramnv1a.c | 10 +++++++++- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv04/arb.c b/drivers/gpu/drm/nouveau/dispnv04/arb.c index 90075b6..c79160c 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/arb.c +++ b/drivers/gpu/drm/nouveau/dispnv04/arb.c @@ -213,8 +213,10 @@ struct nv_sim_state { if ((dev->pdev->device & 0xffff) == 0x01a0 /*CHIPSET_NFORCE*/ || (dev->pdev->device & 0xffff) == 0x01f0 /*CHIPSET_NFORCE2*/) { uint32_t type; + int domain = pci_domain_nr(dev->pdev->bus); - pci_read_config_dword(pci_get_bus...

...v/fb/ramnv1a.c | 10 +++++++++- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv04/arb.c b/drivers/gpu/drm/nouveau/dispnv04/arb.c index 90075b6..c79160c 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/arb.c +++ b/drivers/gpu/drm/nouveau/dispnv04/arb.c @@ -213,8 +213,10 @@ struct nv_sim_state { if ((dev->pdev->device & 0xffff) == 0x01a0 /*CHIPSET_NFORCE*/ || (dev->pdev->device & 0xffff) == 0x01f0 /*CHIPSET_NFORCE2*/) { uint32_t type; + int domain = pci_domain_nr(dev->pdev->bus); - pci_read_config_dword(pci_get_bus...

...ssary lines to the end of the anyterm sysconf --- scripts/ovirt-functions | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index af3a257..1c7b0c4 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -213,11 +213,10 @@ ovirt_setup_libvirtd() { ovirt_setup_anyterm() { # configure anyterm - sed -i -e 's/^# ANYTERM_CMD=\/usr\/bin\/anyterm-cmd/ANYTERM_CMD="sudo \/usr\/bin\/virsh console %p"/' \ - /etc/sysconfig/anyterm - - sed -i -e 's/^# ANYTERM_LOCAL_ONLY=true/A...

...ochs_load_edid(bochs) == 0) + DRM_INFO("Found EDID data blob.\n"); + return 0; } diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c index 9bc5b438ae..b9931443a7 100644 --- a/drivers/gpu/drm/bochs/bochs_kms.c +++ b/drivers/gpu/drm/bochs/bochs_kms.c @@ -213,10 +213,17 @@ static void bochs_encoder_init(struct drm_device *dev) static int bochs_connector_get_modes(struct drm_connector *connector) { - int count; + struct bochs_device *bochs = + container_of(connector, struct bochs_device, connector); + int count = 0; - count = drm_add_modes_noedid(...

...v/fb/ramnv1a.c | 10 +++++++++- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv04/arb.c b/drivers/gpu/drm/nouveau/dispnv04/arb.c index 90075b6..e7455f7 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/arb.c +++ b/drivers/gpu/drm/nouveau/dispnv04/arb.c @@ -213,8 +213,10 @@ struct nv_sim_state { if ((dev->pdev->device & 0xffff) == 0x01a0 /*CHIPSET_NFORCE*/ || (dev->pdev->device & 0xffff) == 0x01f0 /*CHIPSET_NFORCE2*/) { uint32_t type; + u32 domain = pci_domain_nr(dev->pdev->bus); - pci_read_config_dword(pci_get_bus...

...4 files changed, 21 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/dispnv04/arb.c b/drivers/gpu/drm/nouveau/dispnv04/arb.c > index 90075b6..c79160c 100644 > --- a/drivers/gpu/drm/nouveau/dispnv04/arb.c > +++ b/drivers/gpu/drm/nouveau/dispnv04/arb.c > @@ -213,8 +213,10 @@ struct nv_sim_state { > if ((dev->pdev->device & 0xffff) == 0x01a0 /*CHIPSET_NFORCE*/ || > (dev->pdev->device & 0xffff) == 0x01f0 /*CHIPSET_NFORCE2*/) { > uint32_t type; > + int domain = pci_domain_nr(dev->pdev->bus); > > - pci...

...input; } @@ -154,7 +160,8 @@ swfdec_video_create_movie (SwfdecGraphic movie->video = SWFDEC_VIDEO (graphic); g_object_ref (graphic); - swfdec_video_movie_set_input (movie, input); + if (input) + swfdec_video_movie_set_input (movie, input); return SWFDEC_MOVIE (movie); } @@ -213,10 +220,12 @@ tag_func_define_video (SwfdecSwfDecoder SWFDEC_LOG (" deblocking: %d", deblocking); SWFDEC_LOG (" smoothing: %d", smoothing); SWFDEC_LOG (" format: %d", (int) video->format); - video->codec = swfdec_codec_get_video (video->format);...

...in /builder/index-scan.c /builder/libguestfs.conf /builder/opensuse.conf +/builder/osinfo_config.ml /builder/oUnit-* /builder/*.out /builder/*.qcow2 diff --git a/builder/Makefile.am b/builder/Makefile.am index 7aa97e31d..4a2f639c3 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -213,6 +213,10 @@ CLEANFILES += *.qcow2 *.xz check_DATA = $(disk_images) +osinfo_config.ml: Makefile + echo 'let libosinfo_db_path = "$(datadir)/libosinfo/db"' > $@-t + mv $@-t $@ + fedora.qcow2: ../test-data/phony-guests/fedora.img rm -f $@ $@-t qemu-img convert -f raw -O...

...x-scan.c /builder/libguestfs.conf /builder/opensuse.conf +/builder/osinfo_config.ml /builder/oUnit-* /builder/*.qcow2 /builder/stamp-virt-builder.pod diff --git a/builder/Makefile.am b/builder/Makefile.am index f3becd51d..e315bc785 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -213,6 +213,10 @@ CLEANFILES += *.qcow2 *.xz check_DATA = $(disk_images) +osinfo_config.ml: Makefile + echo 'let libosinfo_db_path = "$(datadir)/libosinfo/db"' > $@-t + mv $@-t $@ + fedora.qcow2: ../test-data/phony-guests/fedora.img rm -f $@ $@-t qemu-img convert -f raw -O...

This is based on Sasha's patch, with some tweaks. Michael S. Tsirkin (2): virtio_pci: device-specific release callback virtio_pci: document why we defer kfree Sasha Levin (1): virtio_pci: defer kfree until release callback drivers/virtio/virtio_pci_common.h | 1 - drivers/virtio/virtio_pci_common.c | 9 --------- drivers/virtio/virtio_pci_legacy.c | 12 +++++++++++- 3 files

This is based on Sasha's patch, with some tweaks. Michael S. Tsirkin (2): virtio_pci: device-specific release callback virtio_pci: document why we defer kfree Sasha Levin (1): virtio_pci: defer kfree until release callback drivers/virtio/virtio_pci_common.h | 1 - drivers/virtio/virtio_pci_common.c | 9 --------- drivers/virtio/virtio_pci_legacy.c | 12 +++++++++++- 3 files

...k; - "output", Some local_disk; - ] in + "url", Some remote_disk; + "output", Some local_disk; + ] in let curl_args = if sslverify then curl_args else ("insecure", None) :: curl_args in @@ -213,9 +213,10 @@ read the man page virt-v2v-copy-to-local(1). if quiet () then ("silent", None) :: curl_args else curl_args in + let curl_h = Curl.create curl_args in if verbose () then - Curl.print_curl_command stderr curl_args; - ignore (Cur...

...har **names; char **descs; } export_list; +static int collect_context (void *opaque, const char *name); static int collect_export (void *opaque, const char *name, const char *desc); static void list_one_export (struct nbd_handle *nbd, const char *desc, @@ -207,10 +213,10 @@ main (int argc, char *argv[]) nbd_set_uri_allow_local_file (nbd, true); /* Allow ?tls-psk-file. */ /* Set optional modes in the handle. */ - if (list_all) + if (!map && !size_only) { nbd_set_opt_mode (nbd, true); - if (!map && !size_only) nbd_set_full_info...

..._shoff; - shnum = e32_hdr.e_shnum; - shstrndx = e32_hdr.e_shstrndx; - shentsize = e32_hdr.e_shentsize; + phoff = e32_hdr.e_phoff; + phnum = e32_hdr.e_phnum; + phentsize = e32_hdr.e_phentsize; } else if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS64) { /* read the header again for x86_64 @@ -213,10 +206,9 @@ int main(int argc, char **argv) fread((void *)&e64_hdr, sizeof(e64_hdr), 1, f_in); id = e64_hdr.e_ident; entry = e64_hdr.e_entry; - shoff = e64_hdr.e_shoff; - shnum = e64_hdr.e_shnum; - shstrndx = e64_hdr.e_shstrndx; - shentsize = e64_hdr.e_shentsize; + phoff = e64_hd...

...char buffer[100]; @@ -206,6 +303,7 @@ char *auth_server(int fd, int module, char *addr, char *leader) { char *users = lp_auth_users(module); + char *group = lp_ldap_auth_usergroup(module); char challenge[16]; char b64_challenge[30]; char line[MAXPATHLEN]; @@ -213,10 +311,19 @@ char secret[100]; char pass[30]; char pass2[30]; - char *tok; /* if no auth list then allow anyone in! */ - if (!users || !*users) return ""; +#ifdef WITH_LDAP + if ((!users || !*users) && (!group || !*group)) retur...

..._app_search(desc, name, arch) - -Return a string describing what v2v is looking for in the config file. The -string is intended to be presented to the user to help improve the configuration -file. - -=cut - -sub get_app_search +sub _get_app_search { my ($desc, $name, $arch) = @_; @@ -216,6 +213,10 @@ sub match_app my $dom = $self->{dom}; + die(user_message(__x("No config specified. No app match for {search}", + search => _get_app_search($desc, $name, $arch)))) + unless (defined($dom)); + my $distro = $desc->{distro};...

...rup -x '*.html' -x '*.8' -x '*.5' nut-2.7.4.orig/docs/man/upsmon.conf.txt nut-2.7.4.dev/docs/man/upsmon.conf.txt --- nut-2.7.4.orig/docs/man/upsmon.conf.txt 2015-12-29 13:08:34.000000000 +0100 +++ nut-2.7.4.dev/docs/man/upsmon.conf.txt 2016-07-06 22:27:57.514216079 +0200 @@ -213,6 +213,10 @@ REPLBATT;; The UPS battery is bad and ne NOCOMM;; A UPS is unavailable (can't be contacted for monitoring) +SIGUSR1;; A UPS has received signal SIGUSR1. What this means is defined locally. + +SIGUSR2;; A UPS has received signal SIGUSR2. What this means is defined locally. +...

...rep/main.ml +++ b/sysprep/main.ml @@ -36,7 +36,7 @@ let () = Sysprep_operation.bake () let () = Random.self_init () let main () = - let operations, g, mount_opts = + let operations, g, mount_opts, ks = let domain = ref None in let dryrun = ref false in let files = ref [] in @@ -213,10 +213,10 @@ read the man page virt-sysprep(1). add g dryrun; g#launch (); - operations, g, mount_opts in + operations, g, mount_opts, opthandle.ks in (* Decrypt the disks. *) - inspect_decrypt g; + inspect_decrypt g ks; (* Inspection. *) (match Array.to_list (g#in...

This resend includes the rebase, but fixes a problem I just noticed with nil/empty checks.