similar to: [PATCH] gitignore: ignore the guestfs.* directory

From: Wanlong Gao <gaowanlong at cn.fujitsu.com> Tweak the error message "e2fsck -f" and "e2fsck -fy". Indicate the user to use the correct and/or forceall options. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- daemon/ext2.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/daemon/ext2.c b/daemon/ext2.c index

From: Wanlong Gao <gaowanlong at cn.fujitsu.com> Tweak the error message "e2fsck -f" and "e2fsck -fy". Indicate the user to use the correct and/or forceall options. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- daemon/ext2.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/daemon/ext2.c b/daemon/ext2.c index

Move the filename's comma character checking to a wrapper. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- src/launch.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/launch.c b/src/launch.c index ca89b63..8eaaac8 100644 --- a/src/launch.c +++ b/src/launch.c @@ -277,6 +277,16 @@ valid_format_iface (const char *str) return

Add the email address for authors. It will be better. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- AUTHORS | 48 ++++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/AUTHORS b/AUTHORS index 0d6fb3c..702de5d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,24 +1,24 @@ -Angus Salkeld -Ani Peter -Charles Duffy -Daniel

Tweak the error message "e2fsck -f" and "e2fsck -fy" to "e2fsck-f" and "e2fsck-fy". Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- daemon/ext2.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/daemon/ext2.c b/daemon/ext2.c index 79fd354..9fe938e 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c

https://bugzilla.redhat.com/show_bug.cgi?id=769680

Remove the .ssh directory of user "root" and any other users who have a .ssh directory in their home directorys. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- TODO | 1 - sysprep/Makefile.am | 2 ++ sysprep/sysprep_operation_ssh_userdir.ml | 46 ++++++++++++++++++++++++++++++ 3 files changed, 48

This API is used to stop a md device. When we want to move a device to another md array, we should stop the md device which contained this device first. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- daemon/md.c | 16 ++++++++++++++++ generator/generator_actions.ml | 9 +++++++++ regressions/test-mdadm.sh | 14 ++++++++++++++ src/MAX_PROC_NR

RHEL5 shoult not support '-p', '-i' and '-o export' options. But we just split it according to the '-p' option. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- daemon/blkid.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 73 insertions(+), 7 deletions(-) diff --git a/daemon/blkid.c b/daemon/blkid.c index

When add_string() error, it returned without free the *ret*. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- daemon/md.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/md.c b/daemon/md.c index 5a4d815..8d28878 100644 --- a/daemon/md.c +++ b/daemon/md.c @@ -294,12 +294,12 @@ do_md_detail(const char *md) } } + if

Handle SIGQUIT by guestfish, so that it can't be terminated. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- fish/fish.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/fish/fish.c b/fish/fish.c index efd6b0b..b782b7c 100644 --- a/fish/fish.c +++ b/fish/fish.c @@ -402,6 +402,7 @@ main (int argc, char *argv[]) sa.sa_handler = user_cancel;

The -o export option is the default, so remove this useless option. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- daemon/blkid.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/blkid.c b/daemon/blkid.c index f23eac6..e6bcf32 100644 --- a/daemon/blkid.c +++ b/daemon/blkid.c @@ -119,7 +119,7 @@ blkid_with_p_opt(const char *device) int

Optimizations by reducing the STREQ operations and do some code cleanup. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- daemon/mkfs.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/daemon/mkfs.c b/daemon/mkfs.c index a2c2366..7757623 100644 --- a/daemon/mkfs.c +++ b/daemon/mkfs.c @@ -44,13 +44,16 @@ do_mkfs_opts (const

This API is used to stop a md device. When we want to move a device to another md array, we should stop the md device which contained this device first. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- daemon/md.c | 16 ++++++++++++++++ generator/generator_actions.ml | 9 +++++++++ regressions/test-mdadm.sh | 14 ++++++++++++++ src/MAX_PROC_NR

to_vp_device is worth changing to inlined definition. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- drivers/virtio/virtio_pci.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c index e3ecc94..7681fe3 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c @@ -98,11 +98,7 @@

to_vp_device is worth changing to inlined definition. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- drivers/virtio/virtio_pci.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c index e3ecc94..7681fe3 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c @@ -98,11 +98,7 @@

audit.log is already included in /var/log/audit/*. Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> --- sysprep/sysprep_operation_logfiles.ml | 1 - 1 file changed, 1 deletion(-) diff --git a/sysprep/sysprep_operation_logfiles.ml b/sysprep/sysprep_operation_logfiles.ml index 842b855..cdfe8fc 100644 --- a/sysprep/sysprep_operation_logfiles.ml +++

We're trying to re-configure the affinity unconditionally in cpu hotplug callback. This may lead the issue during resuming from s3/s4 since - virt queues haven't been allocated at that time. - it's unnecessary since thaw method will re-configure the affinity. Fix this issue by checking the config_enable and do nothing is we're not ready. The bug were introduced by commit

We're trying to re-configure the affinity unconditionally in cpu hotplug callback. This may lead the issue during resuming from s3/s4 since - virt queues haven't been allocated at that time. - it's unnecessary since thaw method will re-configure the affinity. Fix this issue by checking the config_enable and do nothing is we're not ready. The bug were introduced by commit

Convert the virtio-scsi driver to use pr_err() instead of printk(). Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- drivers/scsi/virtio_scsi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index 612e320..f679b8c 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c @@