Bug 1721375

Description of problem:
The event types in block-job and block-job-2 events are incorrect when --active is used for blockcommit.

This is a regression. 
It is correct with libvirt-4.5.0-23.module+el8.1.0+2947+d70a8de0.x86_64 and 
libvirt-5.0.0-10.module+el8.0.1+3363+49e420ce.x86_64

Version-Release number of selected component (if applicable):
libvirt-5.3.0-1.module+el8.1.0+3164+94495c71.x86_64

How reproducible:
100%

Steps to Reproduce:

1. Set selinux to Permissive before doing blockcommit, due to bug 1717768 

2. Run libvirt-tck script for testing perl-Sys-Virt package.
# vim scripts/event/150-domain-blockjob.t
...
sub check_event {
    my $job_type = shift;
    my $job_status = shift;
    my $type_name = shift;
    my $status_name = shift;
    $event_type = '';
    $event_type2 = '';
...
    is($event_type, $job_type, "Get block job type: $type_name");
    is($event_status, $job_status, "Get block job status: $status_name");
    is($event_type2, $job_type, "Get block job 2 type: $type_name");
    is($event_status2, $job_status, "Get block job 2 status: $status_name");
}

sub blockjob_cb {
    my $con = shift;
    my $dom = shift;
    my $path = shift;
    $event_type = shift;
    $event_status = shift;
    print "Block job callback: $path $event_type $event_status\n";
}

sub commit_active {
    diag "basepath=$basepath, toppath=$toppath";
    return $dom->block_commit("vda", $basepath, $toppath, 1000, Sys::Virt::Domain::BLOCK_COMMIT_ACTIVE);
}

sub commit_relative {
    diag "basepath=$basepath, toppath=$toppath";
    return $dom->block_commit("vda", $basepath, $toppath, 1000, Sys::Virt::Domain::BLOCK_COMMIT_RELATIVE|
                                                    Sys::Virt::Domain::BLOCK_COMMIT_ACTIVE);
}

my @tests = (
   {
        job => "block_commit_active",
        event => Sys::Virt::Domain::BLOCK_JOB_TYPE_ACTIVE_COMMIT,
        result => Sys::Virt::Domain::BLOCK_JOB_READY,
        func => \&commit_active,
        result_msg => "ready",
    },
    {
        job => "block_commit_relative",
        event => Sys::Virt::Domain::BLOCK_JOB_TYPE_ACTIVE_COMMIT,
        result => Sys::Virt::Domain::BLOCK_JOB_READY,
        func => \&commit_relative,
        result_msg => "completed",
    },
);

# libvirt-tck --testdir scripts/event/150-domain-blockjob.t -v --force

Block job callback: /var/cache/libvirt-tck/storage-fs/tck/tck.snapshot3 3 3
Block job 2 callback: vda 3 3
not ok 27 - Get block job type: block_commit_active          <=== Fail
#   Failed test 'Get block job type: block_commit_active'
#   at scripts/event/150-domain-blockjob.t line 61.
#          got: '3'
#     expected: '4'
ok 28 - Get block job status: ready
not ok 29 - Get block job 2 type: block_commit_active        <=== Fail
#   Failed test 'Get block job 2 type: block_commit_active'
#   at scripts/event/150-domain-blockjob.t line 63.
#          got: '3'
#     expected: '4'
...
Block job callback: /var/cache/libvirt-tck/storage-fs/tck/tck.snapshot3 3 3
Block job 2 callback: vda 3 3
not ok 35 - Get block job type: block_commit_relative        <=== Fail
#   Failed test 'Get block job type: block_commit_relative'
#   at scripts/event/150-domain-blockjob.t line 61.
#          got: '3'
#     expected: '4'
ok 36 - Get block job status: completed
not ok 37 - Get block job 2 type: block_commit_relative      <=== Fail
#   Failed test 'Get block job 2 type: block_commit_relative'
#   at scripts/event/150-domain-blockjob.t line 63.
#          got: '3'
#     expected: '4'
ok 38 - Get block job 2 status: completed


2. At same time, run virsh event to get the event list
...
event 'lifecycle' for domain tck: Started Booted
event 'block-job' for domain tck: Block Commit for /var/cache/libvirt-tck/storage-fs/tck/tck.snapshot3 ready
event 'block-job-2' for domain tck: Block Commit for vda ready
event 'lifecycle' for domain tck: Stopped Destroyed
event 'lifecycle' for domain tck: Undefined Removed
event 'lifecycle' for domain tck: Defined Added
event 'lifecycle' for domain tck: Resumed Unpaused
event 'lifecycle' for domain tck: Started Booted
event 'block-job' for domain tck: Block Commit for /var/cache/libvirt-tck/storage-fs/tck/tck.snapshot3 ready
event 'block-job-2' for domain tck: Block Commit for vda ready
event 'lifecycle' for domain tck: Stopped Destroyed
event 'lifecycle' for domain tck: Undefined Removed

3.

Actual results:
See above.

Expected results:
Below output is for libvirt-4.5.0-23.module+el8.1.0+2947+d70a8de0.x86_64:

Block job callback: /var/cache/libvirt-tck/storage-fs/tck/tck.snapshot3 4 3
Block job 2 callback: vda 4 3
ok 27 - Get block job type: block_commit_active         <=== expected
ok 28 - Get block job status: ready
ok 29 - Get block job 2 type: block_commit_active       <=== expected
ok 30 - Get block job 2 status: ready
# Destroying the running domain
# Undefining the inactive domain config
ok 31 - succeed to create external snapshot
ok 32 - succeed to create external snapshot
ok 33 - succeed to create external snapshot
ok 34 - block pulled
Block job callback: /var/cache/libvirt-tck/storage-fs/tck/tck.snapshot3 4 3
Block job 2 callback: vda 4 3
ok 35 - Get block job type: block_commit_relative       <=== expected
ok 36 - Get block job status: completed 
ok 37 - Get block job 2 type: block_commit_relative     <=== expected
ok 38 - Get block job 2 status: completed

Additional info: